diff --git a/admin/reports.php b/admin/reports.php
index 54c9e06d..8322cd6e 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -65,23 +65,23 @@ $is_all_time = 0;
 /* Default this month to date */
 $date_from = date('Y-m-d', mktime(0, 0, 0, date("m"), 1, date("Y")));
 $date_to = date('Y-m-d');
-$input_datefrom = date('m/d/Y', strtotime('last month'));
-$input_dateto = date('m/d/Y');
+$input_datefrom = date('Y-m-d', strtotime('last month'));
+$input_dateto = date('Y-m-d');
 
 /* Date */
 if (!empty($_GET['w'])) {
     $df = preg_replace('/[^0-9]/', '', hesk_GET('datefrom'));
     if (strlen($df) == 8) {
-        $date_from = substr($df, 4, 4) . '-' . substr($df, 0, 2) . '-' . substr($df, 2, 2);
-        $input_datefrom = substr($df, 0, 2) . '/' . substr($df, 2, 2) . '/' . substr($df, 4, 4);
+        $date_from = substr($df, 0, 4) . '-' . substr($df, 4, 2) . '-' . substr($df, 6, 2);
+        $input_datefrom = $date_from;
     } else {
         $date_from = date('Y-m-d', strtotime('last month'));
     }
 
     $dt = preg_replace('/[^0-9]/', '', hesk_GET('dateto'));
     if (strlen($dt) == 8) {
-        $date_to = substr($dt, 4, 4) . '-' . substr($dt, 0, 2) . '-' . substr($dt, 2, 2);
-        $input_dateto = substr($dt, 0, 2) . '/' . substr($dt, 2, 2) . '/' . substr($dt, 4, 4);
+        $date_to = substr($dt, 0, 4) . '-' . substr($dt, 4, 2) . '-' . substr($dt, 6, 2);
+        $input_dateto = $date_to;
     } else {
         $date_to = date('Y-m-d');
     }
@@ -247,9 +247,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <div class="form-group">
                     <label for="dtrg" class="control-label"><?php echo $hesklang['dtrg']; ?>:</label>
 
-                    <div class="radio move-right-20">
-                        <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> />
+                    <div class="radio form-inline move-right-20">
+                        <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> style="position: relative">
                         <select name="time" onclick="document.getElementById('w0').checked = true"
+                                class="form-control"
                                 onfocus="document.getElementById('w0').checked = true"
                                 style="margin-top:5px;margin-bottom:5px;">
                             <option value="1" <?php echo $selected['time'][1]; ?>><?php echo $hesklang['r1']; ?>
@@ -288,16 +289,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 value="12" <?php echo $selected['time'][12]; ?>><?php echo $hesklang['r12']; ?></option>
                         </select>
                     </div>
-                    <div class="radio move-right-20">
-                        <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> />
+                    <div class="radio form-inline move-right-20">
+                        <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> style="position: relative">
                         <?php echo $hesklang['from']; ?> <input type="text" name="datefrom"
                                                                 value="<?php echo $input_datefrom; ?>"
-                                                                id="datefrom" class="tcal" size="10"
+                                                                id="datefrom" class="datepicker form-control" size="10"
                                                                 onclick="document.getElementById('w1').checked = true"
                                                                 onfocus="document.getElementById('w1').checked = true;this.focus;"/>
                         <?php echo $hesklang['to']; ?> <input type="text" name="dateto"
                                                               value="<?php echo $input_dateto; ?>" id="dateto"
-                                                              class="tcal" size="10"
+                                                              class="datepicker form-control" size="10"
                                                               onclick="document.getElementById('w1').checked = true"
                                                               onfocus="document.getElementById('w1').checked = true; this.focus;"/>
                     </div>