diff --git a/src/EventHub.Web/Pages/Events/Index.js b/src/EventHub.Web/Pages/Events/Index.js
index 158268f..60acf95 100644
--- a/src/EventHub.Web/Pages/Events/Index.js
+++ b/src/EventHub.Web/Pages/Events/Index.js
@@ -18,6 +18,14 @@ $(function () {
     function cb(start, end) {
         $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
     }
+
+    function getRanges() {
+        return {
+            'Today': [moment(), moment()],
+            'Tomorow': [moment().add(1, 'days'), moment().add(1, 'days')],
+            'Next 7 Days': [moment(), moment().add(6, 'days')],
+        };
+    }
     
     var when = $("#WhenInput");
     if (minDate !== null && maxDate !== null && minDate.length > 0 && maxDate.length > 0){
@@ -31,13 +39,7 @@ $(function () {
             locale: {
                 cancelLabel: 'Clear'
             },
-            ranges: {
-                'Today': [moment(), moment()],
-                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-                'This Month': [moment().startOf('month'), moment().endOf('month')],
-                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-            }
+            ranges: getRanges()
         }, cb);
     }else {
         when.daterangepicker({
@@ -45,14 +47,7 @@ $(function () {
             locale: {
                 cancelLabel: 'Clear'
             },
-            ranges: {
-                'Today': [moment(), moment()],
-                'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-                'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-                'Last 30 Days': [moment().subtract(29, 'days'), moment()],
-                'This Month': [moment().startOf('month'), moment().endOf('month')],
-                'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-            }
+            ranges: getRanges()
         }, cb);
     }
     
diff --git a/src/EventHub.Web/Pages/Index.js b/src/EventHub.Web/Pages/Index.js
index 2a08abe..a27fba8 100644
--- a/src/EventHub.Web/Pages/Index.js
+++ b/src/EventHub.Web/Pages/Index.js
@@ -26,24 +26,35 @@
         },
         dots: true,
     });
-    
-    var minDate = ""
-    var maxDate = ""
+
+    function cb(start, end) {
+        $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
+    }
+
+    var minDate = moment();
+    var maxDate = moment();
 
     var $inputWhen = $("#inputWhen");
     $inputWhen.daterangepicker({
+        startDate: minDate,
+        endDate: maxDate,
         autoUpdateInput: false,
         locale: {
             cancelLabel: 'Clear'
+        },
+        ranges: {
+            'Today': [moment(), moment()],
+            'Tomorow': [moment().add(1, 'days'), moment().add(1, 'days')],
+            'Next 7 Days': [moment(), moment().add(6, 'days')],
         }
-    });
-    
+    }, cb);
+
     $inputWhen.on('apply.daterangepicker', function(ev, picker) {
         $(this).val(picker.startDate.format('MM/DD/YYYY') + ' - ' + picker.endDate.format('MM/DD/YYYY'));
         minDate = picker.startDate.format('MM/DD/YYYY')
         maxDate = picker.endDate.format('MM/DD/YYYY')
     });
-    
+
     $inputWhen.on('cancel.daterangepicker', function(ev, picker) {
         $(this).val('');
         minDate = ""