diff --git a/application/controllers/Map.php b/application/controllers/Map.php
index e05c5dde..c3f443ff 100644
--- a/application/controllers/Map.php
+++ b/application/controllers/Map.php
@@ -81,17 +81,13 @@ class Map extends CI_Controller {
 
         if ($this->input->post('from')) {
             $from = $this->input->post('from');
-            $from = DateTime::createFromFormat('m/d/Y g:i A', $from);
-            $from = $from->format('Y-m-d H:i');
-
             $footer_data['date_from'] = $from;
         } else {
             $footer_data['date_from'] = date('Y-m-d H:i:00');
         }
         if ($this->input->post('to')) {
-            $to = DateTime::createFromFormat('m/d/Y g:i A', $this->input->post('to'));
-            $to = $to->modify('+1 day')->format('Y-m-d H:i:00');
-            $footer_data['date_to'] = $to;
+			$to = $this->input->post('to');
+			$footer_data['date_to'] = $to;
         } else {
             $temp_to = new DateTime('tomorrow');
             $footer_data['date_to'] = $temp_to->format('Y-m-d H:i:00');
diff --git a/application/views/map/custom_date.php b/application/views/map/custom_date.php
index e5fc66c6..a1dd4fea 100644
--- a/application/views/map/custom_date.php
+++ b/application/views/map/custom_date.php
@@ -1,106 +1,93 @@
 <div class="container custom-map-QSOs">
+    <br>
+    <h2><?php echo $logbook_name ?> logbook QSOs (Custom Date)</h2>
 
-	<h2><?php echo $logbook_name ?> logbook QSOs (Custom Date)</h2>
+    <?php if ($this->session->flashdata('notice')) { ?>
+        <div class="alert alert-info" role="alert">
+            <?php echo $this->session->flashdata('notice'); ?>
+        </div>
+    <?php } ?>
 
-	<?php if($this->session->flashdata('notice')) { ?>
-	<div class="alert alert-info" role="alert">
-	  <?php echo $this->session->flashdata('notice'); ?>
-	</div>
-	<?php } ?>
+    <form method="post" action="<?php echo site_url('map/custom'); ?>">
+        <div class="row">
+            <div class="mb-3 col-md-3">
+                <label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+                <input name="from" id="from" type="date" class="form-control w-auto">
+            </div>
 
-<form method="post" action="<?php echo site_url('map/custom');?>">
-    <div class="row">
-        <label class="col-md-2 control-label" for="from">Start Date/Time</label>
-        <div class="input-group date col-md-3 w-auto" id="datetimepicker1" data-target-input="nearest">
-            <input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control form-control-sm datetimepicker-input" data-bs-target="#datetimepicker1" <?php if ($this->input->post('from') != "" || $this->input->method() !== 'post') echo 'value="'.$this->input->post('from').'"'; ?>/>
-                <div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
-                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                </div>
+            <div class="mb-3 col-md-3">
+                <label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+                <input name="to" id="to" type="date" class="form-control w-auto">
             </div>
         </div>
-    </row>
 
-    <div class="row">
-        <label class="col-md-2 control-label" for="to">End Date/Time</label>
+        <div class="row">
+            <div class="mb-3 col-md-3">
+                <label for="band">Band</label>
+                <select id="band2" name="band" class="form-select">
+                    <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>>Every band</option>
+                    <?php foreach ($worked_bands as $band) {
+                        echo '<option value="' . $band . '"';
+                        if ($this->input->post('band') == $band) echo ' selected';
+                        echo '>' . $band . '</option>' . "\n";
+                    } ?>
+                </select>
+            </div>
 
-        <div class="input-group date col-md-3 w-auto" id="datetimepicker2" data-target-input="nearest">
-                <input name="to" type="text" placeholder="DD/MM/YYYY" class="form-control form-control-sm datetimepicker-input" data-bs-target="#datetimepicker2" <?php if ($this->input->post('to') != "" || $this->input->method() !== 'post') echo 'value="'.$this->input->post('to').'"'; ?>/>
-                <div class="input-group-append" data-bs-target="#datetimepicker2" data-bs-toggle="datetimepicker">
-                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                </div>
+
+            <div class="mb-3 col-md-3">
+                <label for="mode">Mode</label>
+                <select id="mode" name="mode" class="form-select">
+                    <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>>All</option>
+                    <?php
+                    foreach ($modes->result() as $mode) {
+                        if ($mode->submode == null) {
+                            echo '<option value="' . $mode->mode . '"';
+                            if ($this->input->post('mode') == $mode->mode) echo ' selected';
+                            echo '>' . $mode->mode . '</option>' . "\n";
+                        } else {
+                            echo '<option value="' . $mode->submode . '"';
+                            if ($this->input->post('mode') == $mode->submode) echo ' selected';
+                            echo '>' . $mode->submode . '</option>' . "\n";
+                        }
+                    }
+                    ?>
+                </select>
+            </div>
+
+            <div class="mb-3 col-md-3">
+                <label for="selectPropagation">Propagation Mode</label>
+                <select class="form-select" id="selectPropagation" name="prop_mode">
+                    <option value="All" <?php if ($this->input->post('prop_mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>>All</option>
+                    <option value="AS" <?php if ($this->input->post('prop_mode') == "AS") echo ' selected'; ?>>Aircraft Scatter</option>
+                    <option value="AUR" <?php if ($this->input->post('prop_mode') == "AUR") echo ' selected'; ?>>Aurora</option>
+                    <option value="AUE" <?php if ($this->input->post('prop_mode') == "AUE") echo ' selected'; ?>>Aurora-E</option>
+                    <option value="BS" <?php if ($this->input->post('prop_mode') == "BS") echo ' selected'; ?>>Back scatter</option>
+                    <option value="ECH" <?php if ($this->input->post('prop_mode') == "ECH") echo ' selected'; ?>>EchoLink</option>
+                    <option value="EME" <?php if ($this->input->post('prop_mode') == "EME") echo ' selected'; ?>>Earth-Moon-Earth</option>
+                    <option value="ES" <?php if ($this->input->post('prop_mode') == "ES") echo ' selected'; ?>>Sporadic E</option>
+                    <option value="FAI" <?php if ($this->input->post('prop_mode') == "FAI") echo ' selected'; ?>>Field Aligned Irregularities</option>
+                    <option value="F2" <?php if ($this->input->post('prop_mode') == "F2") echo ' selected'; ?>>F2 Reflection</option>
+                    <option value="INTERNET" <?php if ($this->input->post('prop_mode') == "INTERNET") echo ' selected'; ?>>Internet-assisted</option>
+                    <option value="ION" <?php if ($this->input->post('prop_mode') == "ION") echo ' selected'; ?>>Ionoscatter</option>
+                    <option value="IRL" <?php if ($this->input->post('prop_mode') == "IRL") echo ' selected'; ?>>IRLP</option>
+                    <option value="MS" <?php if ($this->input->post('prop_mode') == "MS") echo ' selected'; ?>>Meteor scatter</option>
+                    <option value="RPT" <?php if ($this->input->post('prop_mode') == "RPT") echo ' selected'; ?>>Terrestrial or atmospheric repeater or transponder</option>
+                    <option value="RS" <?php if ($this->input->post('prop_mode') == "RS") echo ' selected'; ?>>Rain scatter</option>
+                    <option value="SAT" <?php if ($this->input->post('prop_mode') == "SAT") echo ' selected'; ?>>Satellite</option>
+                    <option value="TEP" <?php if ($this->input->post('prop_mode') == "TEP") echo ' selected'; ?>>Trans-equatorial</option>
+                    <option value="TR" <?php if ($this->input->post('prop_mode') == "TR") echo ' selected'; ?>>Tropospheric ducting</option>
+                </select>
+            </div>
         </div>
-    </div>
 
-    <div class="row">
-        <label class="col-md-2 control-label" for="band">Band</label>
-
-        <div class="col-md-3">
-            <select id="band2" name="band" class="form-select form-select-sm">
-                <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
-                <?php foreach($worked_bands as $band) {
-                    echo '<option value="' . $band . '"';
-                    if ($this->input->post('band') == $band) echo ' selected';
-                        echo '>' . $band . '</option>'."\n";
-                } ?>
-            </select>
-        </div>
-    </div>
-
-    <div class="row">
-        <label class="col-md-2 control-label" for="mode">Mode</label>
-        <div class="col-md-3">
-        <select id="mode" name="mode" class="form-select form-select-sm">
-        <option value="All" <?php if ($this->input->post('mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>>All</option>
-            <?php
-            foreach($modes->result() as $mode){
-                if ($mode->submode == null) {
-                    echo '<option value="' . $mode->mode . '"';
-                    if ($this->input->post('mode') == $mode->mode) echo ' selected';
-                    echo '>'. $mode->mode . '</option>'."\n";
-                } else {
-                    echo '<option value="' . $mode->submode . '"';
-                    if ($this->input->post('mode') == $mode->submode) echo ' selected';
-                    echo '>' . $mode->submode . '</option>'."\n";
-                }
-            }
-            ?>
-        </select>
-        </div>
-    </div>
-    <div class="row">
-        <label class="col-md-2 control-label"for="selectPropagation">Propagation Mode</label>
-        <div class="col-md-3">
-            <select class="form-select form-select-sm" id="selectPropagation" name="prop_mode">
-                <option value="All" <?php if ($this->input->post('prop_mode') == "All" || $this->input->method() !== 'post') echo ' selected'; ?>>All</option>
-                <option value="AS" <?php if ($this->input->post('prop_mode') == "AS") echo ' selected';?>>Aircraft Scatter</option>
-                <option value="AUR" <?php if ($this->input->post('prop_mode') == "AUR") echo ' selected';?>>Aurora</option>
-                <option value="AUE" <?php if ($this->input->post('prop_mode') == "AUE") echo ' selected';?>>Aurora-E</option>
-                <option value="BS" <?php if ($this->input->post('prop_mode') == "BS") echo ' selected';?>>Back scatter</option>
-                <option value="ECH" <?php if ($this->input->post('prop_mode') == "ECH") echo ' selected';?>>EchoLink</option>
-                <option value="EME" <?php if ($this->input->post('prop_mode') == "EME") echo ' selected';?>>Earth-Moon-Earth</option>
-                <option value="ES" <?php if ($this->input->post('prop_mode') == "ES") echo ' selected';?>>Sporadic E</option>
-                <option value="FAI" <?php if ($this->input->post('prop_mode') == "FAI") echo ' selected';?>>Field Aligned Irregularities</option>
-                <option value="F2" <?php if ($this->input->post('prop_mode') == "F2") echo ' selected';?>>F2 Reflection</option>
-                <option value="INTERNET" <?php if ($this->input->post('prop_mode') == "INTERNET") echo ' selected';?>>Internet-assisted</option>
-                <option value="ION" <?php if ($this->input->post('prop_mode') == "ION") echo ' selected';?>>Ionoscatter</option>
-                <option value="IRL" <?php if ($this->input->post('prop_mode') == "IRL") echo ' selected';?>>IRLP</option>
-                <option value="MS" <?php if ($this->input->post('prop_mode') == "MS") echo ' selected';?>>Meteor scatter</option>
-                <option value="RPT" <?php if ($this->input->post('prop_mode') == "RPT") echo ' selected';?>>Terrestrial or atmospheric repeater or transponder</option>
-                <option value="RS" <?php if ($this->input->post('prop_mode') == "RS") echo ' selected';?>>Rain scatter</option>
-                <option value="SAT" <?php if ($this->input->post('prop_mode') == "SAT") echo ' selected';?>>Satellite</option>
-                <option value="TEP" <?php if ($this->input->post('prop_mode') == "TEP") echo ' selected';?>>Trans-equatorial</option>
-                <option value="TR" <?php if ($this->input->post('prop_mode') == "TR") echo ' selected';?>>Tropospheric ducting</option>
-            </select>
-        </div>
-    </div>
-
-    <input type="submit" value="Load Map">
-    <br><br>
-</form>
+        <input class="btn btn-primary" type="submit" value="Load Map">
+        <br><br>
+    </form>
 
 </div>
 
-	<!-- Map -->
-	<div id="custommap" style="width: 100%; height: calc(100vh - 380px); max-height: 900px;"></div>
+<!-- Map -->
+<div id="custommap" style="width: 100%; height: calc(100vh - 380px); max-height: 900px;"></div>
 
-    <div class="alert alert-success" role="alert">Showing QSOs for Custom Date for Active Logbook <?php echo $logbook_name ?></div>
+<div class="alert alert-success" role="alert">Showing QSOs for Custom Date for Active Logbook <?php echo $logbook_name ?></div>
\ No newline at end of file