diff --git a/static/main.css b/static/main.css
index 4927c31..2ee054e 100644
--- a/static/main.css
+++ b/static/main.css
@@ -90,6 +90,7 @@ button:active {
 .tags li {
 	display: inline-block;
 	list-style-type: none;
+	margin: 5px;
 }
 
 .tags li a {
@@ -98,7 +99,6 @@ button:active {
 	border-radius: 2px;
 	color: #999;
 	font-size: 0.9em;
-	margin: 5px;
 	padding: 2px 5px 2px 5px;
 }
 
@@ -161,7 +161,14 @@ nav .extra {
 	right: 1em;
 }
 
-nav .extra>a {
+@media only screen and (max-device-width: 500px) {
+	nav .extra {
+		position: static;
+		padding-top: 1em;
+	}
+}
+
+nav .extra > a {
 	background-color: #2ecc40;
 	border: 1px solid #000;
 	border-radius: 5px;
@@ -235,4 +242,12 @@ nav .extra>a {
 
 #local-mode-button .local {
 	color: red;
-}
\ No newline at end of file
+}
+
+#streams input, #voice label, #voice input {
+	display: block;
+	margin-bottom: 5px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 5px;
+}
diff --git a/templates/index.html b/templates/index.html
index e578b44..168cc9f 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -67,8 +67,10 @@
 			</section>
 			<section id="voice" style="display:none;">
 				<form action="/say/" method="POST">
-					<input type="text" name="text" />
-					<input type="text" name="voice" placeholder="DE" />
+					<label for="text">Text</label>
+					<input type="text" name="text" id="text" />
+					<label for="voice">Language/Voice</label>
+					<input type="text" name="voice" id="voice" placeholder="DE" />
 					<label for="speed">Speed</label>
 					<input type="range" name="speed" min="80" max="450" step="10" value="160" id="speed" />
 					<label for="pitch">Pitch</label>