diff --git a/css/options.css b/css/options.css
index 1502fa2803..d80acf7d83 100644
--- a/css/options.css
+++ b/css/options.css
@@ -18,21 +18,24 @@
 }
 
 html {
-	margin: 12px 0 0 100px;
-}
+	margin: 12px 0 0 100px; }
 
 h1 {
-	font-size: 14pt;
+	font-size: 30pt;
 	font-weight: normal;
 	padding-bottom: 10px;
-	border-bottom: 1px solid #e0e0e0;
-}
+	border-bottom: 1px solid #e0e0e0; }
 
 h2 {
 	font-size: 12pt;
-	font-weight: normal;
-}
+	font-weight: normal; }
+
+.hidden {
+	display: none; }
+
+#textsecure-icon {
+	width: 50px;
+	height: 50px; }
 
 #init-go-single-client {
-    display:block;
-}
+    display:block; }
diff --git a/options.html b/options.html
index 31d5960845..3282735074 100644
--- a/options.html
+++ b/options.html
@@ -23,23 +23,23 @@
 	<div id="listener"></div>
 	<div id="log"></div>
 
-	<h1 style="font-size: 30pt;"><img src='icon.png' height='50px' width='50px'/> TextSecure</h1>
-	<div id="init-setup" style="display: none;">
+	<h1><img id="textsecure-icon" src='icon.png'/> TextSecure</h1>
+	<div id="init-setup" class="hidden">
 		<h2>Welcome to TextSecure. To get started please get a 6-digit setup code from your phone and enter it below.</h2>
 		<p>Phone number (including country code): +<input type="text" maxlength=3 size="3" id="countrycode" /> <input type="text" maxlength=14 size="14" id="number" /></p>
 		<button id="init-go-single-client" class="btn">Send single-client code</button>
-		<div id="init-setup-verification" style="display: none;">
+		<div id="init-setup-verification" class="hidden">
 			<p>Code: <input type="text" pattern="[0-9]{3}-?[0-9]{3}" title="Enter the 6-didgit verificaion code displayed on your phone." size="8" id="code" /></p>
 			<button id="init-go" class="btn">Sync</button>
 		</div>
 	</div>
-	<div id="verify" style="display: none;">
+	<div id="verify" class="hidden">
 		<div id="verify1">Verifying number and setup code...<span id="verify1done"></span></div>
 		<div id="verify2">Syncing with existing devices...<span id="verify2done"></span></div>
 		<div id="verify3">Generating keys...<span id="verify3done"></span></div>
 		<div id="verify4">Registering...<span id="verify4done"></span></div>
 	</div>
-	<div id="setup-complete" style="display: none;">
+	<div id="setup-complete" class="hidden">
 		<h2>You are now registered on TextSecure with number <span id="complete-number"></span></h2>
 	</div>
 	<script type="text/javascript" src="js-deps/nacl-common.js"></script>