diff --git a/src/assets/css/general.css b/src/assets/css/general.css
index 26ea2527..e6621114 100644
--- a/src/assets/css/general.css
+++ b/src/assets/css/general.css
@@ -72,6 +72,10 @@ body .ui-widget.ui-widget-content {
     padding: 0;
 }
 
+body #ui-datepicker-div {
+    margin-top: 4px;
+}
+
 body .ui-datepicker .ui-widget-header {
     border: none;
     background: #3DD481;
@@ -84,6 +88,7 @@ body .ui-datepicker .ui-widget-header .ui-icon {
 
 body .ui-datepicker .ui-datepicker-title {
     color: white;
+    padding: 8px 5px;
 }
 
 body .ui-datepicker th {
@@ -152,6 +157,23 @@ body .ui-datepicker .ui-slider-handle {
     background-color: #3DD481;
 }
 
+body .ui-priority-primary,
+body .ui-widget-content .ui-priority-primary,
+body .ui-widget-header .ui-priority-primary {
+    font-weight: normal;
+}
+
+body .ui-widget input, .ui-widget select,
+body .ui-widget textarea,
+body .ui-widget button {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
+
+body .ui-datepicker .ui-datepicker-buttonpane button {
+    padding: 6px 16px;
+}
+
 .breaks tr:hover td {
     background: #FFFFC2 !important;
 }
@@ -160,17 +182,17 @@ body .ui-datepicker .ui-slider-handle {
     vertical-align: middle;
 }
 
-.breaks td  {
+.breaks td {
     vertical-align: middle;
 }
 
 li.language:hover {
-	cursor: pointer;
-	color: #005580;
+    cursor: pointer;
+    color: #005580;
 }
 
 #select-language {
-	cursor: pointer;
+    cursor: pointer;
     display: inline-block;
     padding: 4px 5px;
 }
@@ -186,33 +208,117 @@ li.language:hover {
 
 /* JQUERY UI DATETIME PICKER ADDON
    ------------------------------------------------------------------------- */
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; }
 
-.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none;  width: 95%; }
-.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; }
+.ui-timepicker-div .ui-widget-header {
+    margin-bottom: 8px;
+}
 
-.ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
-.ui-timepicker-rtl dl dt{ float: right; clear: right; }
-.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }
+.ui-timepicker-div dl {
+    text-align: left;
+}
+
+.ui-timepicker-div dl dt {
+    float: left;
+    clear: left;
+    padding: 0 0 0 5px;
+}
+
+.ui-timepicker-div dl dd {
+    margin: 0 10px 10px 40%;
+}
+
+.ui-timepicker-div dl dd.ui_tpicker_time {
+    margin-bottom: 4px;
+}
+
+.ui-timepicker-div dl dd.ui_tpicker_hour,
+.ui-timepicker-div dl dd.ui_tpicker_minute {
+    padding-top: 8px;
+}
+
+.ui-timepicker-div td {
+    font-size: 90%;
+}
+
+.ui-tpicker-grid-label {
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+
+.ui-timepicker-div .ui_tpicker_unit_hide {
+    display: none;
+}
+
+.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input {
+    background: none;
+    color: inherit;
+    border: none;
+    outline: none;
+    width: 95%;
+}
+
+.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus {
+    border-bottom-color: #aaa;
+}
+
+.ui-timepicker-rtl {
+    direction: rtl;
+}
+
+.ui-timepicker-rtl dl {
+    text-align: right;
+    padding: 0 5px 0 0;
+}
+
+.ui-timepicker-rtl dl dt {
+    float: right;
+    clear: right;
+}
+
+.ui-timepicker-rtl dl dd {
+    margin: 0 40% 10px 10px;
+}
 
 /* Shortened version style */
-.ui-timepicker-div.ui-timepicker-oneLine { padding-right: 2px; }
+.ui-timepicker-div.ui-timepicker-oneLine {
+    padding-right: 2px;
+}
+
 .ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,
-.ui-timepicker-div.ui-timepicker-oneLine dt { display: none; }
-.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label { display: block; padding-top: 2px; }
-.ui-timepicker-div.ui-timepicker-oneLine dl { text-align: right; }
+.ui-timepicker-div.ui-timepicker-oneLine dt {
+    display: none;
+}
+
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label {
+    display: block;
+    padding-top: 2px;
+}
+
+.ui-timepicker-div.ui-timepicker-oneLine dl {
+    text-align: right;
+}
+
 .ui-timepicker-div.ui-timepicker-oneLine dl dd,
-.ui-timepicker-div.ui-timepicker-oneLine dl dd > div { display:inline-block; margin:0; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd > div {
+    display: inline-block;
+    margin: 0;
+}
+
 .ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,
-.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before { content:':'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before {
+    content: ':';
+    display: inline-block;
+}
+
 .ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,
-.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before {
+    content: '.';
+    display: inline-block;
+}
+
 .ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,
-.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before {
+    display: none;
+}