diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js
index 6acd563a..713f6751 100644
--- a/source/Ox.UI/js/Form/Ox.Filter.js
+++ b/source/Ox.UI/js/Form/Ox.Filter.js
@@ -419,12 +419,23 @@ Ox.Filter = function(options, self) {
                         id: 'start',
                         width: 112
                     }),
+                    /*
+                    Ox.TimeInput({
+                        id: 'start',
+                        //seconds: true,
+                        width: {
+                            hours: 38,
+                            minutes: 37,
+                            seconds: 37
+                        }
+                    }),
+                    */
                     Ox.DateInput({
                         id: 'end',
                         width: {
-                            day: 27,
-                            month: 27,
-                            year: 42
+                            day: 32,
+                            month: 32,
+                            year: 48
                         }
                     })
                 ],
diff --git a/source/Ox.UI/js/Form/Ox.TimeInput.js b/source/Ox.UI/js/Form/Ox.TimeInput.js
index 68e34571..98bab378 100644
--- a/source/Ox.UI/js/Form/Ox.TimeInput.js
+++ b/source/Ox.UI/js/Form/Ox.TimeInput.js
@@ -23,6 +23,13 @@ Ox.TimeInput = function(options, self) {
                 seconds: false,
                 milliseconds: false,
                 value: Ox.formatDate(new Date(), '%T'),
+                width: {
+                    hours: 32,
+                    minutes: 32,
+                    seconds: 32,
+                    milliseconds: 40,
+                    ampm: 32
+                }
             })
             .options(options || {});
 
@@ -46,7 +53,7 @@ Ox.TimeInput = function(options, self) {
             id: 'hours',
             textAlign: 'right',
             value: self.values.hours,
-            width: 32
+            width: self.options.width.hours
         }),
         minutes: new Ox.Input({
             autocomplete: $.map(Ox.range(0, 60), function(v) {
@@ -57,7 +64,7 @@ Ox.TimeInput = function(options, self) {
             id: 'minutes',
             textAlign: 'right',
             value: self.values.minutes,
-            width: 32
+            width: self.options.width.minutes
         }),
         seconds: new Ox.Input({
             autocomplete: $.map(Ox.range(0, 60), function(v) {
@@ -68,7 +75,7 @@ Ox.TimeInput = function(options, self) {
             id: 'seconds',
             textAlign: 'right',
             value: self.values.seconds,
-            width: 32
+            width: self.options.width.seconds
         }),
         milliseconds: new Ox.Input({
             autocomplete: $.map(Ox.range(0, 1000), function(v) {
@@ -79,7 +86,7 @@ Ox.TimeInput = function(options, self) {
             id: 'milliseconds',
             textAlign: 'right',
             value: self.values.milliseconds,
-            width: 40
+            width: self.options.width.milliseconds
         }),
         ampm: new Ox.Input({
             autocomplete: ['AM', 'PM'],
@@ -87,7 +94,7 @@ Ox.TimeInput = function(options, self) {
             autocompleteReplaceCorrect: true,
             id: 'ampm',
             value: self.values.ampm,
-            width: 32
+            width: self.options.width.seconds
         })
     };