diff --git a/www/index.html b/www/index.html
index 46fcd52..0b8b430 100644
--- a/www/index.html
+++ b/www/index.html
@@ -38,7 +38,7 @@
 <!-- Start of first page -->
 <div data-role="page" id="boxes">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<p>makes 3D printing very easy</p>
 
 	<!-- <p>Please select your Doodle3D WiFi-Box to connect or press search to add your box to this list.</p> -->
@@ -60,7 +60,7 @@
 
 <div data-role="page" id="box">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1></h1>
@@ -82,7 +82,7 @@
 <!-- Start of FIND page -->
 <div data-role="page" id="find">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Find a WiFi-Box</h1>
@@ -104,7 +104,7 @@
 <!-- Start of FIND_STEP2 page -->
 <div data-role="page" id="find_step2">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Find a WiFi-Box</h1>
@@ -127,7 +127,7 @@
 <!-- Start of STEP1_PROBLEMS page -->
 <div data-role="page" id="problems">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Troubleshooting</h1>
@@ -163,7 +163,7 @@
 
 <div data-role="page" id="ethernet">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Troubleshooting</h1>
@@ -177,7 +177,7 @@
 
 <div data-role="page" id="locate_wifibox">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Troubleshooting</h1>
@@ -206,7 +206,7 @@
 <!-- Start of CONNECT AP page -->
 <div data-role="page" id="connect_ap">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Doodle3D-987654 (accesspoint)</h1>
@@ -227,7 +227,7 @@
 <!-- Start of reset page -->
 <div data-role="page" id="reset">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Troubleshooting</h1>
@@ -273,7 +273,7 @@
 
 <div data-role="page" id="join_network">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Join network</h1>
@@ -285,9 +285,6 @@
 		<ul data-role="listview" 
 			data-connecting-target="#connecting_to_network" 
 			data-secured-target="#join_secured_network">
-			<!-- <li data-icon="lock"><a href="#join_secured_network">Baksteen</a></li>
-			<li><a href="#connecting_to_network">Thomson12445</a></li>
-			<li><a href="#connecting_to_network">H234SD53</a></li>-->
 			<li data-icon="edit" id="joinOther"><a href="#join_other_network">Other...</a></li>
 		</ul>
 	</div><!-- /content -->
@@ -295,7 +292,7 @@
 </div><!-- /page -->
 
 <div data-role="page" id="join_secured_network">
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Connect</h1>
@@ -308,7 +305,7 @@
 </div><!-- /page -->
 
 <div data-role="page" id="join_other_network">
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Connect</h1>
@@ -322,7 +319,7 @@
 </div><!-- /page -->
 
 <div data-role="page" id="connecting_to_network">
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
 		<h1>Connecting...</h1>
@@ -336,7 +333,7 @@
 </div><!-- /page -->
 
 <div data-role="page" id="draw">
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 
 	<div role="main" class="ui-content">
 		<div id="drawingCanvas"></div>
@@ -347,7 +344,7 @@
 
 <div data-role="page" id="settings">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 
 	<div role="main" class="ui-content">
 		<p>Settings</p>
@@ -359,7 +356,7 @@
 
 <div data-role="page" id="tune">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
@@ -406,7 +403,7 @@
 
 <div data-role="page" id="control">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
@@ -439,7 +436,7 @@
 
 <div data-role="page" id="update">
 
-	<a href="#devices"><img id="logo" src="img/logo_full.png"></a>
+	<a href="#boxes"><img id="logo" src="img/logo_full.png"></a>
 
 	<div data-role="header">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>