diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644
index 0000000..e9e7ce7
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="node_modules/|www/" kind="src" path="">
+		<attributes>
+			<attribute name="provider" value="org.eclipse.wst.jsdt.web.core.internal.project.ModuleSourcePathProvider"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.prefs b/.settings/org.eclipse.wst.jsdt.ui.prefs
new file mode 100644
index 0000000..6bf5ec1
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.wst.jsdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 9be84e2..839ded9 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,8 @@ define Package/doodle3d-client/install
 	$(CP) $(PKG_BUILD_DIR)/www/settings.html $(1)/www/
 	$(CP) $(PKG_BUILD_DIR)/www/helpcontent.html $(1)/www/
 	$(CP) $(PKG_BUILD_DIR)/www/redirect.html $(1)/www/
-	
+	$(CP) $(PKG_BUILD_DIR)/www/404.html $(1)/www/
+
 	$(CP) $(PKG_BUILD_DIR)/www/css/debug.min.css $(1)/www/css/
 	$(CP) $(PKG_BUILD_DIR)/www/css/settings.min.css $(1)/www/css/
 	$(CP) $(PKG_BUILD_DIR)/www/css/styles.min.css $(1)/www/css/
diff --git a/js/gcodeGenerating.js b/js/gcodeGenerating.js
index d01a4d3..98c7380 100644
--- a/js/gcodeGenerating.js
+++ b/js/gcodeGenerating.js
@@ -218,6 +218,7 @@ function subsituteVariables(gcode) {
     case "makerbot_replicator2x": printerType = "r2x"; break;
     case "makerbot_thingomatic": printerType = "t6"; break;
     case "makerbot_generic": printerType = "r2"; break;
+    case "wanhao_duplicator4": printerType = "r2x"; break;
     case "_3Dison_plus": printerType = "r2"; break;
   }
   var heatedBedReplacement = (heatedbed)? "" : ";";
diff --git a/less/404.less b/less/404.less
index 9105c50..98213d4 100644
--- a/less/404.less
+++ b/less/404.less
@@ -7,11 +7,34 @@
 		top: 50%;
 		left: 50%;
 		height: 200px;
-		width: 500px;
-		margin: -85px 0px 0px -250px;
+		width: 30em;
+		margin: -85px 0px 0px -16em;
 		
 		background-color: #FCFCFC;
 		padding: 0px 1em;
 	}
 }
+@media screen and (max-width: 485px) {
+	#page404 {
+		overflow-y: auto;
+		#message404 {
+			position: relative;	
+			left: 0px;
+			top: 0px;
+			margin: 10% 0;
+			padding: 0;
+			width: 100%;
+			height: auto;
+			p, ul {
+				margin: 1em;
+			}
+		}
+		#landscape {
+			box-shadow: none;
+			.bgContainer {
+				display: none;
+			}
+		}
+	}
+}
 
diff --git a/www/img/buttons/btnScan.png b/www/img/buttons/btnScan.png
deleted file mode 100644
index 3ce983d..0000000
Binary files a/www/img/buttons/btnScan.png and /dev/null differ
diff --git a/www/redirect.html b/www/redirect.html
index 85187ce..bb2bbb4 100644
--- a/www/redirect.html
+++ b/www/redirect.html
@@ -16,15 +16,14 @@
 
   <link href="css/styles.min.css" rel="stylesheet" media="screen">
   <link href="css/debug.min.css" rel="stylesheet" media="screen">
-  
-  <script src="js/libs/jquery-1-9-1.min.js"></script>
 
 </head>
 <body id="page404">
 Success
+  <script src="js/libs/jquery-1-9-1.min.js"></script>
   <script>
-		$(document.body).load("404.html");
-		document.title = "Doodle3D 404"
+    $(document.body).load("404.html");
+    document.title = "Doodle3D 404"
   </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/www/settings.html b/www/settings.html
index 1131770..1e84aba 100644
--- a/www/settings.html
+++ b/www/settings.html
@@ -60,6 +60,7 @@
       <label for="printerDimensionsZ"></label>
       z:<input id="printerDimensionsZ" type="number" class="small" name="printer.dimensions.z" placeholder="z">mm<br>
       <label for="heatedBed">Heated bed:</label><input id="heatedBed" type="checkbox" name="printer.heatedbed" value="heatedbed"><br>
+      <label for="filamentThickness">Filament thickness:</label><input id="filamentThickness" step="0.01" type="number" class="small" name="printer.filamentThickness">mm<br>
       <fieldset id="gcodePanel">
  		<legend>GCODE settings</legend>
  		<div>
@@ -91,7 +92,6 @@
       <legend>Print settings</legend>
       <label for="layerHeight">Layer height:</label><input id="layerHeight" type="number" step="0.01" class="small" name="printer.layerHeight">mm<br>
       <label for="wallThickness">Wall thickness:</label><input id="wallThickness" type="number" step="0.1" class="small" name="printer.wallThickness">mm<br>
-      <label for="filamentThickness">Filament thickness:</label><input id="filamentThickness" step="0.01" type="number" class="small" name="printer.filamentThickness">mm<br>
       <label for="temperature">Temperature:</label><input id="temperature" type="number" class="small" name="printer.temperature">degrees C<br>
       <label for="bedTemperature">Bed temperature:</label><input id="bedTemperature" type="number" class="small" name="printer.bed.temperature">degrees C<br>
       <br>