diff --git a/Sensors/css/styles.css b/Sensors/css/styles.css
index 69da99dd..aa0f4502 100644
--- a/Sensors/css/styles.css
+++ b/Sensors/css/styles.css
@@ -3,11 +3,12 @@
 	height: 1110px;
 	margin-top: 10px;
 }
-#menu {
+/*#menu {
 	background-color: #5B5;
-}
-#sensorScreen, #optionScreen {
+}*/
+#sensorScreen, #options, #menu {
 	background-color: #262626;
+	color: #fff;
 }
 .flotr-titles {
 	color: #00A8DF;
diff --git a/Sensors/index.html b/Sensors/index.html
index 79c1f902..1786d9d6 100644
--- a/Sensors/index.html
+++ b/Sensors/index.html
@@ -36,7 +36,7 @@
 			onscreenready: function(element, id) {
 				// Choose the sensor based on ID of the link selected, and start listening
 				var sensor = bbsensors[id];
-				if (sensor) {
+				if (sensor && sensor.name) {
 					bbsensors.listen(sensor);
 				} else {
 					bbsensors.listen('');
diff --git a/Sensors/options.html b/Sensors/options.html
index 084e7179..1541edfb 100644
--- a/Sensors/options.html
+++ b/Sensors/options.html
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 -->
-<div style="background-color:#262626" data-bb-type="screen" data-bb-effect="slide-left">
+<div id="options" data-bb-type="screen" data-bb-effect="slide-left">
 	<div id="SensorOptPanel" data-bb-type="round-panel">
 		<div data-bb-type="panel-header">Sensor Options</div>
 		<div data-bb-type="label">Delay:</div>
@@ -32,7 +32,6 @@
 		<div id="opt_queue" data-bb-type="toggle" data-bb-on="Yes" data-bb-off="No" onchange="bbsensors.options.queue = opt_queue.checked"></div>
 		<div data-bb-type="label">Reduced Reporting:</div>
 		<div id="opt_reducedReporting" data-bb-type="toggle" data-bb-on="Yes" data-bb-off="No" onchange="bbsensors.options.reducedReporting = opt_reducedReporting.checked"></div>
-		<!-- <div data-bb-type="button" onclick="" id="setOptions">Set Options</div> -->
 	</div>
 	<div data-bb-type="action-bar" data-bb-back-caption="Back"></div>
 </div>
\ No newline at end of file