diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py
index b36da49..7a7a647 100644
--- a/apimanager/apimanager/settings.py
+++ b/apimanager/apimanager/settings.py
@@ -249,8 +249,8 @@ API_DATE_FORMAT_WITH_SECONDS  = '%Y-%m-%dT%H:%M:%SZ'
 API_DATE_FORMAT_WITH_MILLISECONDS = '%Y-%m-%dT%H:%M:%S.%fZ'
 
 # the API_Manager the web form date format, eg: 2020-10-11
-API_MANAGER_DATE_FORMAT= '%Y-%m-%d'
-API_FIELD_DATE_FORMAT= '%Y-%m-%d'
+API_MANAGER_DATE_FORMAT= '%Y-%m-%d' #TODO: API_DATE_FORMAT_WITH_DAY
+API_FIELD_DATE_FORMAT= '%Y-%m-%d' #TODO: REMOVE
 API_FIELD_TIME_FORMAT= '%H-%M-%S'
 
 
diff --git a/apimanager/metrics/templates/metrics/custom_summary.html b/apimanager/metrics/templates/metrics/custom_summary.html
index 15f2ce9..9df7381 100644
--- a/apimanager/metrics/templates/metrics/custom_summary.html
+++ b/apimanager/metrics/templates/metrics/custom_summary.html
@@ -38,32 +38,30 @@
 				<div class="col-xs-6 col-sm-3">
 					{% if form.from_date_custom.errors %}<div class="alert alert-danger">{{ form.from_date_custom.errors }}</div>{% endif %}
 					<div class="form-group">
-						<strong>{% trans "From Date Custom" %} </strong>
+						<strong>{% trans "From Date" %} </strong>
 						{{ form.from_date_custom }}
 					</div>
 					</div>
-					<div class="col-xs-6 col-sm-4">
-						{% if form.from_time_custom.errors %}<div class="alert alert-danger">{{ form.from_time_custom.errors }}</div>{% endif %}
-						<div class="form-group">
-							<strong>{% trans "From Time Custom" %} </strong>
-							{{ form.from_time_custom }}
-						</div>
+				<div class="col-xs-6 col-sm-3">
+					{% if form.from_time_custom.errors %}<div class="alert alert-danger">{{ form.from_time_custom.errors }}</div>{% endif %}
+					<div class="form-group">
+						<strong>{% trans "From Time" %} </strong>
+						{{ form.from_time_custom }}
 					</div>
 				</div>
-			<div class="row">
 				<div class="col-xs-6 col-sm-3">
 					{% if form.to_date.errors %}<div class="alert alert-danger">{{ form.to_date.errors }}</div>{% endif %}
 					<div class="form-group">
-						<strong>{% trans "To Date Custom" %} </strong>
+						<strong>{% trans "To Date" %} </strong>
 						{{ form.to_date }}
 					</div>
+				</div>
+				<div class="col-xs-6 col-sm-3">
+					{% if form.to_date_time.errors %}<div class="alert alert-danger">{{ form.to_date_time.errors }}</div>{% endif %}
+					<div class="form-group">
+						<strong>{% trans "To Time" %} </strong>
+						{{ form.to_date_time }}
 					</div>
-					<div class="col-xs-6 col-sm-3">
-						{% if form.to_date_time.errors %}<div class="alert alert-danger">{{ form.to_date_time.errors }}</div>{% endif %}
-						<div class="form-group">
-							<strong>{% trans "To Time Custom" %} </strong>
-							{{ form.to_date_time }}
-						</div>
 				</div>
 				<div class="col-xs-4 col-sm-3">
 					{% if form.include_app_names.errors %}<div class="alert alert-danger">{{ form.include_app_names.errors }}</div>{% endif %}