diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html
index a979678b..088573c3 100644
--- a/data/interfaces/default/graphs.html
+++ b/data/interfaces/default/graphs.html
@@ -322,11 +322,11 @@
 
         // Initial values for graph from config
         var yaxis = "${config['graph_type']}";
-        var current_range = ${config['graph_days']};
+        var current_day_range = ${config['graph_days']};
         var current_month_range = ${config['graph_months']};
         var current_tab = "${'#' + config['graph_tab']}";
         
-        $('.days').html(current_range);
+        $('.days').html(current_day_range);
         $('.months').html(current_month_range);
         
         // Load user ids and names (for the selector)
@@ -557,15 +557,15 @@
         }
 
         // Set initial state
-        if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
-        if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
+        if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+        if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
         if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
 
         // Tab1 opened
         $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            loadGraphsTab1(current_range, yaxis);
+            loadGraphsTab1(current_day_range, yaxis);
             $.ajax({
                 url: 'set_graph_config',
                 data: { graph_tab: current_tab.replace('#','') },
@@ -577,7 +577,7 @@
         $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            loadGraphsTab2(current_range, yaxis);
+            loadGraphsTab2(current_day_range, yaxis);
             $.ajax({
                 url: 'set_graph_config',
                 data: { graph_tab: current_tab.replace('#','') },
@@ -599,24 +599,26 @@
 
         // Date range changed
         $('#graph-days').on('change', function() {
-            current_range = $(this).val();
-            if (current_range < 1) {
+            current_day_range = Math.round($(this).val());
+            $(this).val(current_day_range);
+            if (current_day_range < 1) {
                 $(this).val(7);
-                current_range = 7;
+                current_day_range = 7;
             }
-            if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
-            if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
-            $('.days').html(current_range);
+            if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            $('.days').html(current_day_range);
             $.ajax({
                 url: 'set_graph_config',
-                data: { graph_days: current_range},
+                data: { graph_days: current_day_range},
                 async: true
             });
         });
         
         // Month range changed
         $('#graph-months').on('change', function() {
-            current_month_range = $(this).val();
+            current_month_range = Math.round($(this).val());
+            $(this).val(current_month_range);
             if (current_month_range < 1) {
                 $(this).val(12);
                 current_month_range = 12;
@@ -633,17 +635,17 @@
         // User changed
         $('#graph-user').on('change', function() {
             selected_user_id = $(this).val() || null;
-            if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
-            if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
+            if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
             if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
         });
         
         // Y-axis changed
         $('#yaxis-selection').on('change', function() {
             yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
-            if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
-            if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
-            if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range,yaxis); }
+            if (current_tab == '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab == '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab == '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
             $.ajax({
                 url: 'set_graph_config',
                 data: { graph_type: yaxis},
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 042c9f44..7cea9681 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -119,9 +119,9 @@
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="week_start" name="week_start" value="1" ${config['week_start']}> Week starting on Monday
+                                <input type="checkbox" id="week_start_monday" name="week_start_monday" value="1" ${config['week_start_monday']}> Week Starting on Monday
                             </label>
-                            <p class="help-block">Default is Sunday. This is only relevant for the Play by day of week graph.</p>
+                            <p class="help-block">Change the "<em>Play by day of week</em>" graph to start on Monday. Default is start on Sunday.</p>
                         </div>
                         <div class="checkbox">
                             <label>
diff --git a/plexpy/config.py b/plexpy/config.py
index c07aad8f..fb8ca8ac 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -566,7 +566,7 @@ _CONFIG_DEFINITIONS = {
     'UPDATE_LABELS': (int, 'General', 1),
     'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1),
     'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1),
-    'WEEK_START': (int, 'General', 0),
+    'WEEK_START_MONDAY': (int, 'General', 0),
     'XBMC_ENABLED': (int, 'XBMC', 0),
     'XBMC_HOST': (str, 'XBMC', ''),
     'XBMC_PASSWORD': (str, 'XBMC', ''),
diff --git a/plexpy/graphs.py b/plexpy/graphs.py
index 0c19c071..fbd9087e 100644
--- a/plexpy/graphs.py
+++ b/plexpy/graphs.py
@@ -169,13 +169,12 @@ class Graphs(object):
             logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_dayofweek: %s." % e)
             return None
 
-        week_start = plexpy.CONFIG.WEEK_START
-        if (week_start == 1):
+        if plexpy.CONFIG.WEEK_START_MONDAY:
             days_list = ['Monday', 'Tuesday', 'Wednesday',
-                     'Thursday', 'Friday', 'Saturday', 'Sunday']
+                         'Thursday', 'Friday', 'Saturday', 'Sunday']
         else:
             days_list = ['Sunday', 'Monday', 'Tuesday', 'Wednesday',
-                     'Thursday', 'Friday', 'Saturday']
+                         'Thursday', 'Friday', 'Saturday']
 
         categories = []
         series_1 = []
@@ -335,19 +334,16 @@ class Graphs(object):
                         'GROUP BY strftime("%%Y-%%m", datetime(started, "unixepoch", "localtime")) ' \
                         'ORDER BY datestring DESC LIMIT %s' % (time_range, user_cond, time_range)
 
-                result = monitor_db.select(query)        
+                result = monitor_db.select(query)
         except Exception as e:
             logger.warn(u"PlexPy Graphs :: Unable to execute database query for get_total_plays_per_month: %s." % e)
             return None
 
         # create our date range as some months may not have any data
         # but we still want to display them
-        time_range = int(time_range)
-        x = time_range
-        
         base = time.localtime()
         month_range = [time.localtime(
-            time.mktime((base.tm_year, base.tm_mon - n, 1, 0, 0, 0, 0, 0, 0))) for n in range(x)]
+            time.mktime((base.tm_year, base.tm_mon - n, 1, 0, 0, 0, 0, 0, 0))) for n in range(int(time_range))]
 
         categories = []
         series_1 = []
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 4eec1a2d..9cc79e9f 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -2623,7 +2623,7 @@ class WebInterface(object):
             "imgur_client_id": plexpy.CONFIG.IMGUR_CLIENT_ID,
             "cache_images": checked(plexpy.CONFIG.CACHE_IMAGES),
             "pms_version": plexpy.CONFIG.PMS_VERSION,
-            "week_start": checked(plexpy.CONFIG.WEEK_START)
+            "week_start_monday": checked(plexpy.CONFIG.WEEK_START_MONDAY)
         }
 
         return serve_template(templatename="settings.html", title="Settings", config=config, kwargs=kwargs)
@@ -2637,7 +2637,7 @@ class WebInterface(object):
         checked_configs = [
             "launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github",
             "grouping_global_history", "grouping_user_history", "grouping_charts", "group_history_tables",
-            "pms_use_bif", "pms_ssl", "pms_is_remote", "home_stats_type", "week_start",
+            "pms_use_bif", "pms_ssl", "pms_is_remote", "home_stats_type", "week_start_monday",
             "movie_notify_enable", "tv_notify_enable", "music_notify_enable", "monitoring_use_websocket",
             "refresh_libraries_on_startup", "refresh_users_on_startup",
             "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable",