diff --git a/tabs/sensors.html b/tabs/sensors.html
index e2d51554..23170093 100644
--- a/tabs/sensors.html
+++ b/tabs/sensors.html
@@ -7,11 +7,11 @@
             update periods.<br />
         </p>
         <div class="checkboxes">
-            Gyroscope <input type="checkbox" name="gyro_on" />
-            Accelerometer <input type="checkbox" name="accel_on" />
-            Magnetometer <input type="checkbox" name="mag_on" />
-            Barometer <input type="checkbox" name="baro_on" />
-            Debug <input type="checkbox" name="debug_on" />
+            <label>Gyroscope <input type="checkbox" name="gyro_on" /></label>
+            <label>Accelerometer <input type="checkbox" name="accel_on" /></label>
+            <label>Magnetometer <input type="checkbox" name="mag_on" /></label>
+            <label>Barometer <input type="checkbox" name="baro_on" /></label>
+            <label>Debug <input type="checkbox" name="debug_on" /></label>
         </div>
     </div>
     <div class="wrapper gyro">
@@ -36,6 +36,7 @@
             <dd class="scale">
                 <select name="gyro_scale">
                     <option value="100">100</option>
+                    <option value="500">500</option>
                     <option value="1000">1000</option>
                     <option value="2000" selected="selected">2000</option>
                 </select>
diff --git a/tabs/sensors.js b/tabs/sensors.js
index 04e1d9d5..7f1ccc41 100644
--- a/tabs/sensors.js
+++ b/tabs/sensors.js
@@ -157,7 +157,7 @@ function tab_initialize_sensors() {
     $('#content').load("./tabs/sensors.html", function load_html() {
         $('.tab-sensors .info .checkboxes input').change(function() {
             var enable = $(this).prop('checked');
-            var index = $(this).index();
+            var index = $(this).parent().index();
 
             switch (index) {
                 case 0:
@@ -178,7 +178,7 @@ function tab_initialize_sensors() {
             }
 
             var checkboxes = [];
-            $('.tab-sensors .info input').each(function() {
+            $('.tab-sensors .info .checkboxes input').each(function() {
                 checkboxes.push($(this).prop('checked'));
             });
 
@@ -189,7 +189,7 @@ function tab_initialize_sensors() {
 
         chrome.storage.local.get('graphs_enabled', function(result) {
             if (result.graphs_enabled) {
-                var checkboxes = $('.tab-sensors .info input');
+                var checkboxes = $('.tab-sensors .info .checkboxes input');
                 for (var i = 0; i < result.graphs_enabled.length; i++) {
                     checkboxes.eq(i).prop('checked', result.graphs_enabled[i]).change();
                 }
@@ -302,7 +302,7 @@ function tab_initialize_sensors() {
 
             // fetch currently enabled plots
             var checkboxes = [];
-            $('.tab-sensors .info input').each(function() {
+            $('.tab-sensors .info .checkboxes input').each(function() {
                 checkboxes.push($(this).prop('checked'));
             });