diff --git a/web/app/sketcher/main2d.js b/web/app/sketcher/main2d.js
index dfe949e7..455fd0b6 100644
--- a/web/app/sketcher/main2d.js
+++ b/web/app/sketcher/main2d.js
@@ -163,6 +163,11 @@ TCAD.App2D = function() {
     app.viewer.parametricManager.solve([], 0, 4);
     app.viewer.refresh();
   });
+
+  this.registerAction('CLEAN UP', "Clean All Draw", function () {
+    app.cleanUp();
+    app.viewer.refresh();
+  });
 };
 
 TCAD.App2D.prototype.loadFromLocalStorage = function() {
@@ -176,8 +181,23 @@ TCAD.App2D.prototype.loadFromLocalStorage = function() {
   this.viewer.repaint();
 };
 
+TCAD.App2D.prototype.cleanUp = function() {
+  for (var l = 0; l < this.viewer.layers.length; ++l) {
+    var layer = this.viewer.layers[l];
+    if (layer.objects.length != 0) {
+      layer.objects = [];
+    }
+  }
+  if (this.viewer.parametricManager.system.length != 0) {
+    this.viewer.parametricManager.system = [];
+    this.viewer.parametricManager.notify();
+  }
+};
+
 TCAD.App2D.prototype.loadSketch = function(sketch) {
 
+    this.cleanUp();
+
     var index = {};
 
     function endPoint(p) {
diff --git a/web/test.html b/web/test.html
index ae6e2644..ae65dc57 100644
--- a/web/test.html
+++ b/web/test.html
@@ -1,46 +1,61 @@
+<!doctype html>
+<meta charset=utf-8>
 <html>
 <head>
-	<title>TCAD</title>
-	<style>
+  <title>Sketcher Tests</title>
+  <style>
 		body {
 			font-family: Monospace;
-			margin: 0px;
 			overflow: hidden;
 		}
-	</style>
-
-	<script> TCAD = {} </script>
-	
-	<script src="lib/three/three.js"></script>
-	<script src="lib/numeric-1.2.6.js"></script>
-	<script src="app/sketcher/canvas.js"></script>
-	<script src="app/math/vector.js"></script>
-	<script src="app/math/math.js"></script>
-	<script src="app/math/qr.js"></script>
-	<script src="app/engine.js"></script>
-	
-	<script src="app/math/matrix.js"></script>
-	<script src="app/math/optim.js"></script>
-	<script src="app/math/noptim.js"></script>
-
-	<script src="app/math/lm.js"></script>
-	<script src="app/sketcher/constr/constraints.js"></script>
-	<script src="app/sketcher/constr/solver.js"></script>
-
-	<script src="app/engine.js"></script>
-	<script src="app/math/test.js"></script>
-
-	<script>
-		function start() {
-			new TCAD.App2D();
+		
+		html, body {
+			background: gray;
+			height: 100%;
+			padding: 0;
+			margin: 0;
 		}
-		window.onload = function() {
-//			testCompare();
-			lsolve();
-		}
-	</script>
+  </style>
+
+  <script src="lib/jquery-2.1.0.min.js"></script>
+  <script src="lib/three/three.js"></script>
+  <script src="lib/numeric-1.2.6.js"></script>
+  <script src="app/sketcher/canvas.js"></script>
+  <script src="app/sketcher/shapes/arc.js"></script>
+  <script src="app/sketcher/shapes/circle.js"></script>
+  <script src="app/sketcher/shapes/segment.js"></script>
+  <script src="app/sketcher/shapes/dim.js"></script>
+
+  <script src="app/math/vector.js"></script>
+  <script src="app/math/math.js"></script>
+  <script src="app/math/qr.js"></script>
+  <script src="app/math/matrix.js"></script>
+  <script src="app/math/optim.js"></script>
+  <script src="app/math/noptim.js"></script>
+
+  <script src="app/math/lm.js"></script>
+  <script src="app/sketcher/constr/constraints.js"></script>
+  <script src="app/sketcher/constr/solver.js"></script>
+
+  <script src="app/sketcher/parametric.js"></script>
+  <script src="app/sketcher/fetchers.js"></script>
+  <script src="app/engine.js"></script>
+  <script src="app/sketcher/main2d.js"></script>
+  <script src="app/workbench.js"></script>
+  <script src="app/ui.js"></script>
+  <script src="app/math/graph.js"></script>
+  
+  <script>
+    function start() {
+      var app = new TCAD.App2D();
+    }
+    window.onload = function() {
+      setTimeout(start, 0);
+    };
+  </script>
 </head>
 <body>
-
+  <canvas width="300" height="300" id="viewer"></canvas>
+  <div id="testResults"></div>
 </body>
 </html>
\ No newline at end of file
