diff --git a/.gitignore b/.gitignore
index d7dbe1f7..ed470dab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ OctoPrint.egg-info
 *.orig
 
 *.codekit
-/nbproject/private/
\ No newline at end of file
+/nbproject/
+.directory
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index c434ed3f..b5d8947f 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -78,10 +78,10 @@ default_settings = {
 		"maxExtruders": 10
 	},
 	"feature": {
-		"temperatureGraph": True,
+		"temperatureGraph": False,
 		"waitForStartOnConnect": False,
 		"alwaysSendChecksum": False,
-		"sdSupport": True,
+		"sdSupport": False,
 		"sdAlwaysAvailable": False,
 		"swallowOkAfterResend": True,
 		"repetierTargetTemp": False,
@@ -117,7 +117,7 @@ default_settings = {
 			{"x": 0.0, "y": 0.0}
 		],
 		"bedDimensions": {
-			"x": 200.0, "y": 200.0, "r": 100, "circular": False
+			"x": 435.0, "y": 300.0, "r": 100, "circular": False
 		},
 		"defaultExtrusionLength": 5
 	},
diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 71e71c52..d605f3e4 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -68,7 +68,7 @@ function GcodeFilesViewModel(printerStateViewModel, loginStateViewModel, slicing
             }
         },
         "name",
-        ["machinecode"],
+        [],
         [["sd", "local"], ["machinecode", "model"]],
         0
     );
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index be037be8..ab3f52af 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -151,23 +151,23 @@
                             <div class="accordion-inner">
                                 {{ _('Machine State') }}: <strong data-bind="text: stateString"></strong><br>
                                 {{ _('File') }}: <strong data-bind="text: filename"></strong>&nbsp;<strong data-bind="visible: sd">(SD)</strong><br>
-                                {{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>
+<!--                                {{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>-->
                                 <!-- ko foreach: filament -->
-                                <span data-bind="text: 'Filament (' + name() + '): '"></span><strong data-bind="text: formatFilament(data())"></strong><br>
+                                <!--<span data-bind="text: 'Filament (' + name() + '): '"></span><strong data-bind="text: formatFilament(data())"></strong><br>-->
                                 <!-- /ko -->
-                                {{ _('Approx. Total Print Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
-                                {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>
-                                {{ _('Print Time Left') }}: <strong data-bind="text: printTimeLeftString"></strong><br>
-                                {{ _('Printed') }}: <strong data-bind="text: byteString"></strong><br>
+                                {{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
+<!--                                {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>
+                                {{ _('Print Time Left') }}: <strong data-bind="text: printTimeLeftString"></strong><br>-->
+                                {{ _('Processed') }}: <strong data-bind="text: byteString"></strong><br>
 
                                 <div class="progress">
                                     <div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }"></div>
                                 </div>
 
                                 <div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
-                                    <button class="btn btn-primary span4" data-bind="click: print, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), css: {'btn-danger': isPaused()}, attr: {title: titlePrintButton}" id="job_print"><i class="icon-white" data-bind="css: {'icon-print': !isPaused(), 'icon-undo': isPaused()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Print') }}')">{{ _('Print') }}</span></button>
+                                    <button class="btn btn-primary span4" data-bind="click: print, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), css: {'btn-danger': isPaused()}, attr: {title: titlePrintButton}" id="job_print"><i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span></button>
                                     <button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
-                                    <button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the print job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>
+                                    <button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>
                                 </div>
                             </div>
                         </div>
@@ -228,7 +228,7 @@
                                             <a class="btn btn-mini" data-bind="attr: {href: $root.downloadLink($data), css: {disabled: !$root.downloadLink($data)}}"><i class="icon-download-alt" title="{{ _('Download') }}"></i></a>
                                             <div class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i></div>
                                             <div class="btn btn-mini" data-bind="click: function() { if ($root.enableSelect($data)) { $root.loadFile($data, false); } else { return; } }, css: {disabled: !$root.enableSelect($data)}"><i class="icon-folder-open" title="{{ _('Load') }}"></i></div>
-                                            <div class="btn btn-mini"  data-bind="click: function() { if ($root.enableSelect($data)) { $root.loadFile($data, true); } else { return; } }, css: {disabled: !$root.enableSelect($data)}"><i class="icon-print" title="{{ _('Load and Print') }}"></i></div>
+                                            <div class="btn btn-mini"  data-bind="click: function() { if ($root.enableSelect($data)) { $root.loadFile($data, true); } else { return; } }, css: {disabled: !$root.enableSelect($data)}"><i class="icon-fire" title="{{ _('Load and Laser') }}"></i></div>
                                         </div>
                                     </script>
 
@@ -248,7 +248,7 @@
                                         <div class="size">{{ _('Size') }}: <span data-bind="text: formatSize(size)"></span></div>
                                         <div class="btn-group action-buttons">
                                             <div class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i></div>
-                                            <div class="btn btn-mini"  data-bind="click: function() { $root.convertSVG($data);  }, css: {disabled: !$root.enableSVGConversion($data)}"><i class="icon-print" title="{{ _('Convert to Laserpath') }}"></i></div>
+                                            <div class="btn btn-mini"  data-bind="click: function() { $root.convertSVG($data); }, css: {disabled: !$root.enableSVGConversion($data)}"><i class="icon-fire" title="{{ _('Convert to Laserpath') }}"></i></div>
                                         </div>
                                     </script>
 
@@ -539,7 +539,7 @@
                                 <h1>Warning</h1>
 
                                 <p>
-                                You've selected <strong data-bind="text: selectedFile.name"></strong> for printing which has a size of
+                                You've selected <strong data-bind="text: selectedFile.name"></strong> which has a size of
                                 <strong data-bind="text: formatSize(selectedFile.size())"></strong>. Depending on your machine this
                                 might be too large for rendering and cause your browser to become unresponsive or crash.
                                 </p>