diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index 98ead09..bc57d61 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -161,364 +161,376 @@
                     </div>
                 </div>
 
-                <div class="tabbable span8">
-                    <ul class="nav nav-tabs" id="tabs">
-                        <li class="active"><a href="#temp" data-toggle="tab">Temperature</a></li>
-                        <li><a href="#controls" data-toggle="tab">Controls</a></li>
-                        {% if enableGCodeVisualizer %}<li><a href="#gcode" data-toggle="tab">GCode Viewer</a></li>{% endif %}
-                        <!--<li><a href="#speed" data-toggle="tab">Speed</a></li>-->
-                        <li><a href="#term" data-toggle="tab">Terminal</a></li>
-                        {% if webcamStream %}<li><a href="#webcam" data-toggle="tab">Webcam</a></li>{% endif %}
-                    </ul>
-
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="temp">
-                            <div class="row" style="padding-left: 20px">
-                                <div id="temperature-graph"></div>
+                <div class="span8">
+                    {% if webcamStream %}
+                    <div class="accordion">
+                        <div class="accordion-group">
+                            <div class="accordion-heading">
+                                <a class="accordion-toggle" data-toggle="collapse" href="#webcam"><i class="icon-eye-open"></i> Webcam</a>
                             </div>
-                            <div class="row-fluid" style="margin-bottom: 20px">
-                                <div class="form-horizontal span6">
-                                    <h1>Temperature</h1>
-
-                                    <label>Current: <strong data-bind="html: tempString"></strong></label>
-
-                                    <label>Target: <strong data-bind="html: targetTempString"></strong></label>
-
-                                    <label for="temp_newTemp">New Target</label>
-                                    <div class="input-append">
-                                        <input type="text" id="temp_newTemp" data-bind="attr: {placeholder: targetTemp}" class="tempInput">
-                                        <span class="add-on">&deg;C</span>
-                                    </div>
-                                    <div class="btn-group">
-                                        <button type="submit" class="btn" id="temp_newTemp_set">Set</button>
-                                        <button class="btn dropdown-toggle" data-toggle="dropdown">
-                                            <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu">
-                                            <!-- ko foreach: temperature_profiles -->
-                                            <li>
-                                                <a href="#" data-bind="click: $parent.setTempFromProfile, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a>
-                                            </li>
-                                            <!-- /ko -->
-                                            <li class="divider"></li>
-                                            <li>
-                                                <a href="#" data-bind="click: function() { $root.setTemp(0); }">Off</a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </div>
-                                <div class="form-horizontal span6">
-                                    <h1>Bed Temperature</h1>
-
-                                    <label>Current: <strong data-bind="html: bedTempString"></strong></label>
-
-                                    <label>Target: <strong data-bind="html: bedTargetTempString"></strong></label>
-
-                                    <label for="temp_newBedTemp">New Target</label>
-                                    <div class="input-append">
-                                        <input type="text" id="temp_newBedTemp" data-bind="attr: {placeholder: bedTargetTemp}" class="tempInput">
-                                        <span class="add-on">&deg;C</span>
-                                    </div>
-                                    <div class="btn-group">
-                                        <button type="submit" class="btn" id="temp_newBedTemp_set">Set</button>
-                                        <button class="btn dropdown-toggle" data-toggle="dropdown">
-                                            <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu">
-                                             <!-- ko foreach: temperature_profiles -->
-                                             <li>
-                                                 <a href="#" data-bind="click: $parent.setBedTempFromProfile, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a>
-                                             </li>
-                                             <!-- /ko -->
-                                             <li class="divider"></li>
-                                             <li>
-                                                 <a href="#" data-bind="click: function(){ $root.setBedTemp(0); }">Off</a>
-                                             </li>
-                                        </ul>
+                            <div class="accordion-body collapse" id="webcam">
+                                <div class="accordion-inner">
+                                    <div id="webcam_container">
+                                        <img id="webcam_image" src="{{ webcamStream }}">
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <div class="tab-pane" id="controls">
-                            <div class="jog-panel">
-                                <!-- XY jogging control panel -->
+                    </div>
+                    {% endif %}
+                    <div class="tabbable">
+                        <ul class="nav nav-tabs" id="tabs">
+                            <li class="active"><a href="#temp" data-toggle="tab">Temperature</a></li>
+                            <li><a href="#controls" data-toggle="tab">Controls</a></li>
+                            {% if enableGCodeVisualizer %}<li><a href="#gcode" data-toggle="tab">GCode Viewer</a></li>{% endif %}
+                            <!--<li><a href="#speed" data-toggle="tab">Speed</a></li>-->
+                            <li><a href="#term" data-toggle="tab">Terminal</a></li>
+                            {% if enableTimelapse %}<li><a href="#timelapse" data-toggle="tab">Timelapse</a></li>{% endif %}
+                        </ul>
+
+                        <div class="tab-content">
+                            <div class="tab-pane active" id="temp">
+                                <div class="row" style="padding-left: 20px">
+                                    <div id="temperature-graph"></div>
+                                </div>
+                                <div class="row-fluid" style="margin-bottom: 20px">
+                                    <div class="form-horizontal span6">
+                                        <h1>Temperature</h1>
+
+                                        <label>Current: <strong data-bind="html: tempString"></strong></label>
+
+                                        <label>Target: <strong data-bind="html: targetTempString"></strong></label>
+
+                                        <label for="temp_newTemp">New Target</label>
+                                        <div class="input-append">
+                                            <input type="text" id="temp_newTemp" data-bind="attr: {placeholder: targetTemp}" class="tempInput">
+                                            <span class="add-on">&deg;C</span>
+                                        </div>
+                                        <div class="btn-group">
+                                            <button type="submit" class="btn" id="temp_newTemp_set">Set</button>
+                                            <button class="btn dropdown-toggle" data-toggle="dropdown">
+                                                <span class="caret"></span>
+                                            </button>
+                                            <ul class="dropdown-menu">
+                                                <!-- ko foreach: temperature_profiles -->
+                                                <li>
+                                                    <a href="#" data-bind="click: $parent.setTempFromProfile, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a>
+                                                </li>
+                                                <!-- /ko -->
+                                                <li class="divider"></li>
+                                                <li>
+                                                    <a href="#" data-bind="click: function() { $root.setTemp(0); }">Off</a>
+                                                </li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                    <div class="form-horizontal span6">
+                                        <h1>Bed Temperature</h1>
+
+                                        <label>Current: <strong data-bind="html: bedTempString"></strong></label>
+
+                                        <label>Target: <strong data-bind="html: bedTargetTempString"></strong></label>
+
+                                        <label for="temp_newBedTemp">New Target</label>
+                                        <div class="input-append">
+                                            <input type="text" id="temp_newBedTemp" data-bind="attr: {placeholder: bedTargetTemp}" class="tempInput">
+                                            <span class="add-on">&deg;C</span>
+                                        </div>
+                                        <div class="btn-group">
+                                            <button type="submit" class="btn" id="temp_newBedTemp_set">Set</button>
+                                            <button class="btn dropdown-toggle" data-toggle="dropdown">
+                                                <span class="caret"></span>
+                                            </button>
+                                            <ul class="dropdown-menu">
+                                                 <!-- ko foreach: temperature_profiles -->
+                                                 <li>
+                                                     <a href="#" data-bind="click: $parent.setBedTempFromProfile, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a>
+                                                 </li>
+                                                 <!-- /ko -->
+                                                 <li class="divider"></li>
+                                                 <li>
+                                                     <a href="#" data-bind="click: function(){ $root.setBedTemp(0); }">Off</a>
+                                                 </li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="tab-pane" id="controls">
                                 <div class="jog-panel">
-                                    <h1>X/Y</h1>
-                                    <div>
-                                        <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('y',1) }"><i class="icon-arrow-up"></i></button>
+                                    <!-- XY jogging control panel -->
+                                    <div class="jog-panel">
+                                        <h1>X/Y</h1>
+                                        <div>
+                                            <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('y',1) }"><i class="icon-arrow-up"></i></button>
+                                        </div>
+                                        <div>
+                                            <button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('x',-1) }"><i class="icon-arrow-left"></i></button>
+                                            <button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendHomeCommand('XY') }"><i class="icon-home"></i></button>
+                                            <button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('x',1) }"><i class="icon-arrow-right"></i></button>
+                                        </div>
+                                        <div>
+                                            <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('y',-1) }"><i class="icon-arrow-down"></i></button>
+                                        </div>
                                     </div>
-                                    <div>
-                                        <button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('x',-1) }"><i class="icon-arrow-left"></i></button>
-                                        <button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendHomeCommand('XY') }"><i class="icon-home"></i></button>
-                                        <button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('x',1) }"><i class="icon-arrow-right"></i></button>
+                                    <!-- Z jogging control panel -->
+                                    <div class="jog-panel">
+                                        <h1>Z</h1>
+                                        <div>
+                                            <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z',1) }"><i class="icon-arrow-up"></i></button>
+                                        </div>
+                                        <div>
+                                            <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendHomeCommand('Z') }"><i class="icon-home"></i></button>
+                                        </div>
+                                        <div>
+                                            <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z',-1) }"><i class="icon-arrow-down"></i></button>
+                                        </div>
                                     </div>
-                                    <div>
-                                        <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('y',-1) }"><i class="icon-arrow-down"></i></button>
+                                    <!-- Jog distance -->
+                                    <div class="distance">
+                                        <div class="btn-group" data-toggle="buttons-radio" id="jog_distance">
+                                            <button type="button" class="btn" data-distance="0.1">0.1</button>
+                                            <button type="button" class="btn" data-distance="1">1</button>
+                                            <button type="button" class="btn active" data-distance="10">10</button>
+                                            <button type="button" class="btn" data-distance="100">100</button>
+                                        </div>
                                     </div>
                                 </div>
-                                <!-- Z jogging control panel -->
+                                <!-- Extrusion control panel -->
                                 <div class="jog-panel">
-                                    <h1>Z</h1>
+                                    <h1>E</h1>
                                     <div>
-                                        <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z',1) }"><i class="icon-arrow-up"></i></button>
+                                        <div class="input-append control-box">
+                                            <input type="text" class="input-mini text-right" data-bind="value: extrusionAmount, enable: isOperational() && !isPrinting(), attr: {placeholder: 5}">
+                                            <span class="add-on">mm</span>
+                                        </div>
+                                        <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendExtrudeCommand() }">Extrude</button>
+                                        <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendRetractCommand() }">Retract</button>
                                     </div>
+                                </div>
+                                <!-- General control panel -->
+                                <div class="jog-panel">
+                                    <h1>General</h1>
                                     <div>
-                                        <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendHomeCommand('Z') }"><i class="icon-home"></i></button>
-                                    </div>
-                                    <div>
-                                        <button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z',-1) }"><i class="icon-arrow-down"></i></button>
+                                        <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M18'}) }"><i class="icon-off"></i>&nbsp;Motors off</button>
+                                        <button class="btn control-box" data-bind="enable: isOperational(), click: function() { $root.sendCustomCommand({type:'command',command:'M106'}) }">Fans on</button>
+                                        <button class="btn control-box" data-bind="enable: isOperational(), click: function() { $root.sendCustomCommand({type:'command',command:'M106 S0'}) }">Fans off</button>
                                     </div>
                                 </div>
-                                <!-- Jog distance -->
-                                <div class="distance">
-                                    <div class="btn-group" data-toggle="buttons-radio" id="jog_distance">
-                                        <button type="button" class="btn" data-distance="0.1">0.1</button>
-                                        <button type="button" class="btn" data-distance="1">1</button>
-                                        <button type="button" class="btn active" data-distance="10">10</button>
-                                        <button type="button" class="btn" data-distance="100">100</button>
+
+                                <!-- Container for custom controls -->
+                                <div style="clear: both;" data-bind="template: { name: $root.displayMode, foreach: controls }"></div>
+
+                                <!-- Templates for custom controls -->
+                                <script type="text/html" id="customControls_sectionTemplate">
+                                    <h1 data-bind="text: name"></h1>
+
+                                    <div data-bind="template: { name: $root.displayMode, foreach: children }"></div>
+                                </script>
+                                <script type="text/html" id="customControls_commandTemplate">
+                                    <form class="form-inline">
+                                        <button class="btn" data-bind="text: name, enable: $root.isOperational(), click: function() { $root.sendCustomCommand($data) }"></button>
+                                    </form>
+                                </script>
+                                <script type="text/html" id="customControls_parametricCommandTemplate">
+                                    <form class="form-inline">
+                                        <!-- ko foreach: input -->
+                                            <label data-bind="text: name"></label>
+                                            <input type="text" class="input-small" data-bind="attr: {placeholder: name}, value: value">
+                                        <!-- /ko -->
+                                        <button class="btn" data-bind="text: name, enable: $root.isOperational(), click: function() { $root.sendCustomCommand($data) }"></button>
+                                    </form>
+                                </script>
+                                <script type="text/html" id="customControls_emptyTemplate"><div></div></script>
+                                <!-- End of templates for custom controls -->
+                            </div>
+                            <div class="tab-pane" id="speed">
+                                <div class="form-horizontal" style="margin-bottom: 20px">
+                                    <label for="speed_outerWall">Outer Wall</label>
+                                    <div class="input-append">
+                                        <input type="text" id="speed_outerWall" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: outerWall}">
+                                        <span class="add-on">%</span>
+                                        <button type="submit" class="btn" id="speed_outerWall_set" data-bind="enable: isOperational()">Set</button>
+                                    </div>
+
+                                    <label for="speed_innerWall">Inner Wall</label>
+                                    <div class="input-append">
+                                        <input type="text" id="speed_innerWall" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: innerWall}">
+                                        <span class="add-on">%</span>
+                                        <button type="submit" class="btn" id="speed_innerWall_set" data-bind="enable: isOperational()">Set</button>
+                                    </div>
+
+                                    <label for="speed_fill">Fill</label>
+                                    <div class="input-append">
+                                        <input type="text" id="speed_fill" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: fill}">
+                                        <span class="add-on">%</span>
+                                        <button type="submit" class="btn" id="speed_fill_set" data-bind="enable: isOperational()">Set</button>
+                                    </div>
+
+                                    <label for="speed_support">Support</label>
+                                    <div class="input-append">
+                                        <input type="text" id="speed_support" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: support}">
+                                        <span class="add-on">%</span>
+                                        <button type="submit" class="btn" id="speed_support_set" data-bind="enable: isOperational()">Set</button>
                                     </div>
                                 </div>
                             </div>
-                            <!-- Extrusion control panel -->
-                            <div class="jog-panel">
-                                <h1>E</h1>
-                                <div>
-                                    <div class="input-append control-box">
-                                        <input type="text" class="input-mini text-right" data-bind="value: extrusionAmount, enable: isOperational() && !isPrinting(), attr: {placeholder: 5}">
-                                        <span class="add-on">mm</span>
-                                    </div>
-                                    <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendExtrudeCommand() }">Extrude</button>
-                                    <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendRetractCommand() }">Retract</button>
-                                </div>
-                            </div>
-                            <!-- General control panel -->
-                            <div class="jog-panel">
-                                <h1>General</h1>
-                                <div>
-                                    <button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M18'}) }"><i class="icon-off"></i>&nbsp;Motors off</button>
-                                    <button class="btn control-box" data-bind="enable: isOperational(), click: function() { $root.sendCustomCommand({type:'command',command:'M106'}) }">Fans on</button>
-                                    <button class="btn control-box" data-bind="enable: isOperational(), click: function() { $root.sendCustomCommand({type:'command',command:'M106 S0'}) }">Fans off</button>
-                                </div>
-                            </div>
+                            <div class="tab-pane" id="gcode">
+                                <canvas id="canvas" width="572" height="588"></canvas>
+                                <div id="slider-vertical"></div>
+                                <div id="slider-horizontal"></div>
 
-                            <!-- Container for custom controls -->
-                            <div style="clear: both;" data-bind="template: { name: $root.displayMode, foreach: controls }"></div>
-
-                            <!-- Templates for custom controls -->
-                            <script type="text/html" id="customControls_sectionTemplate">
-                                <h1 data-bind="text: name"></h1>
-
-                                <div data-bind="template: { name: $root.displayMode, foreach: children }"></div>
-                            </script>
-                            <script type="text/html" id="customControls_commandTemplate">
-                                <form class="form-inline">
-                                    <button class="btn" data-bind="text: name, enable: $root.isOperational(), click: function() { $root.sendCustomCommand($data) }"></button>
-                                </form>
-                            </script>
-                            <script type="text/html" id="customControls_parametricCommandTemplate">
-                                <form class="form-inline">
-                                    <!-- ko foreach: input -->
-                                        <label data-bind="text: name"></label>
-                                        <input type="text" class="input-small" data-bind="attr: {placeholder: name}, value: value">
-                                    <!-- /ko -->
-                                    <button class="btn" data-bind="text: name, enable: $root.isOperational(), click: function() { $root.sendCustomCommand($data) }"></button>
-                                </form>
-                            </script>
-                            <script type="text/html" id="customControls_emptyTemplate"><div></div></script>
-                            <!-- End of templates for custom controls -->
-                        </div>
-                        <div class="tab-pane" id="speed">
-                            <div class="form-horizontal" style="margin-bottom: 20px">
-                                <label for="speed_outerWall">Outer Wall</label>
-                                <div class="input-append">
-                                    <input type="text" id="speed_outerWall" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: outerWall}">
-                                    <span class="add-on">%</span>
-                                    <button type="submit" class="btn" id="speed_outerWall_set" data-bind="enable: isOperational()">Set</button>
-                                </div>
-
-                                <label for="speed_innerWall">Inner Wall</label>
-                                <div class="input-append">
-                                    <input type="text" id="speed_innerWall" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: innerWall}">
-                                    <span class="add-on">%</span>
-                                    <button type="submit" class="btn" id="speed_innerWall_set" data-bind="enable: isOperational()">Set</button>
-                                </div>
-
-                                <label for="speed_fill">Fill</label>
-                                <div class="input-append">
-                                    <input type="text" id="speed_fill" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: fill}">
-                                    <span class="add-on">%</span>
-                                    <button type="submit" class="btn" id="speed_fill_set" data-bind="enable: isOperational()">Set</button>
-                                </div>
-
-                                <label for="speed_support">Support</label>
-                                <div class="input-append">
-                                    <input type="text" id="speed_support" class="input-mini" data-bind="enable: isOperational(), attr: {placeholder: support}">
-                                    <span class="add-on">%</span>
-                                    <button type="submit" class="btn" id="speed_support_set" data-bind="enable: isOperational()">Set</button>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="tab-pane" id="gcode">
-                            <canvas id="canvas" width="572" height="588"></canvas>
-                            <div id="slider-vertical"></div>
-                            <div id="slider-horizontal"></div>
-
-                            <div id="gcode_accordion" class="accordion" style="margin-top: 20px">
-                                <div class="accordion-group">
-                                    <div class="accordion-heading">
-                                        <a class="accordion-toggle" data-toggle="collapse" href="#progressAccordionTab">
-                                            Progress indicators
-                                        </a>
-                                    </div>
-                                    <div id="progressAccordionTab" class="accordion-body collapse in">
-                                        <div class="accordion-inner">
-                                            <div id="progressBlock">
-                                                <div class="progress" >
-                                                    <div id="loadProgress" class="bar" style="width: 0%;"></div>
-                                                </div>
-                                                <div class="progress" >
-                                                    <div id="analyzeProgress" class="bar" style="width: 0%;"></div>
+                                <div id="gcode_accordion" class="accordion" style="margin-top: 20px">
+                                    <div class="accordion-group">
+                                        <div class="accordion-heading">
+                                            <a class="accordion-toggle" data-toggle="collapse" href="#progressAccordionTab">
+                                                Progress indicators
+                                            </a>
+                                        </div>
+                                        <div id="progressAccordionTab" class="accordion-body collapse in">
+                                            <div class="accordion-inner">
+                                                <div id="progressBlock">
+                                                    <div class="progress" >
+                                                        <div id="loadProgress" class="bar" style="width: 0%;"></div>
+                                                    </div>
+                                                    <div class="progress" >
+                                                        <div id="analyzeProgress" class="bar" style="width: 0%;"></div>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="accordion-group">
-                                    <div class="accordion-heading">
-                                        <a class="accordion-toggle" data-toggle="collapse" href="#infoAccordionTab">
-                                            Model info
-                                        </a>
-                                    </div>
-                                    <div id="infoAccordionTab" class="accordion-body collapse in">
-                                        <div class="accordion-inner">
-                                            <p id="list"></p>
+                                    <div class="accordion-group">
+                                        <div class="accordion-heading">
+                                            <a class="accordion-toggle" data-toggle="collapse" href="#infoAccordionTab">
+                                                Model info
+                                            </a>
+                                        </div>
+                                        <div id="infoAccordionTab" class="accordion-body collapse in">
+                                            <div class="accordion-inner">
+                                                <p id="list"></p>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="accordion-group">
-                                    <div class="accordion-heading">
-                                        <a class="accordion-toggle" data-toggle="collapse" href="#layerAccordionTab">
-                                            Layer Info
-                                        </a>
-                                    </div>
-                                    <div id="layerAccordionTab" class="accordion-body collapse in">
-                                        <div class="accordion-inner">
-                                            <p id="layerInfo"></p>
+                                    <div class="accordion-group">
+                                        <div class="accordion-heading">
+                                            <a class="accordion-toggle" data-toggle="collapse" href="#layerAccordionTab">
+                                                Layer Info
+                                            </a>
+                                        </div>
+                                        <div id="layerAccordionTab" class="accordion-body collapse in">
+                                            <div class="accordion-inner">
+                                                <p id="layerInfo"></p>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="accordion-group">
-                                    <div class="accordion-heading">
-                                        <a class="accordion-toggle" data-toggle="collapse" href="#options2DAccordionTab">
-                                            2D Render options
-                                        </a>
-                                    </div>
-                                    <div id="options2DAccordionTab" class="accordion-body collapse in">
-                                        <div class="accordion-inner">
-                                            <input type="checkbox" id="showMovesCheckbox" value="1"  onclick="GCODE.ui.processOptions()" checked>Show non-extrusion moves</input><br>
-                                            <input type="checkbox" id="showRetractsCheckbox" value="2"  onclick="GCODE.ui.processOptions()" checked>Show retracts and restarts</input><br>
-                                            <input type="checkbox" id="moveModelCheckbox" value="3"  onclick="GCODE.ui.processOptions()" checked>Move model to the center of the grid</input><br>
-                                            <input type="checkbox" id="differentiateColorsCheckbox" value="7"  onclick="GCODE.ui.processOptions()" checked>Show different speeds with different colors</input><br>
-                                            <input type="checkbox" id="thickExtrusionCheckbox" value="8"  onclick="GCODE.ui.processOptions()">Emulate extrusion width</input><br>
-                                            Width modifier: <input type="text" value="2" id="widthModifier" onchange="GCODE.ui.processOptions()"/><br>
-                                            <input type="checkbox" id="showNextLayer" value="9"  onclick="GCODE.ui.processOptions()" >Show +1 layer</input><br>
+                                    <div class="accordion-group">
+                                        <div class="accordion-heading">
+                                            <a class="accordion-toggle" data-toggle="collapse" href="#options2DAccordionTab">
+                                                2D Render options
+                                            </a>
+                                        </div>
+                                        <div id="options2DAccordionTab" class="accordion-body collapse in">
+                                            <div class="accordion-inner">
+                                                <input type="checkbox" id="showMovesCheckbox" value="1"  onclick="GCODE.ui.processOptions()" checked>Show non-extrusion moves</input><br>
+                                                <input type="checkbox" id="showRetractsCheckbox" value="2"  onclick="GCODE.ui.processOptions()" checked>Show retracts and restarts</input><br>
+                                                <input type="checkbox" id="moveModelCheckbox" value="3"  onclick="GCODE.ui.processOptions()" checked>Move model to the center of the grid</input><br>
+                                                <input type="checkbox" id="differentiateColorsCheckbox" value="7"  onclick="GCODE.ui.processOptions()" checked>Show different speeds with different colors</input><br>
+                                                <input type="checkbox" id="thickExtrusionCheckbox" value="8"  onclick="GCODE.ui.processOptions()">Emulate extrusion width</input><br>
+                                                Width modifier: <input type="text" value="2" id="widthModifier" onchange="GCODE.ui.processOptions()"/><br>
+                                                <input type="checkbox" id="showNextLayer" value="9"  onclick="GCODE.ui.processOptions()" >Show +1 layer</input><br>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
 
-                                <div class="accordion-group">
-                                    <div class="accordion-heading">
-                                        <a class="accordion-toggle" data-toggle="collapse" href="#analyzeOptionsAccordioinTab">
-                                            GCode analyzer options
-                                        </a>
-                                    </div>
-                                    <div id="analyzeOptionsAccordioinTab" class="accordion-body collapse in">
-                                        <div class="accordion-inner">
-                                            These require re-analyzing file:<br>
-                                            <input type="checkbox" id="sortLayersCheckbox" value="4" onclick="GCODE.ui.processOptions()" checked>Sort layers by Z</input><br>
-                                            <input type="checkbox" id="purgeEmptyLayersCheckbox" value="5"  onclick="GCODE.ui.processOptions()" checked>Hide empty layers</input><br>
-                                            <input type="checkbox" id="showGCodeCheckbox" value="6" onclick="GCODE.ui.processOptions()" checked>Show GCode in GCode tab (memory intensive!)</input><br>
+                                    <div class="accordion-group">
+                                        <div class="accordion-heading">
+                                            <a class="accordion-toggle" data-toggle="collapse" href="#analyzeOptionsAccordioinTab">
+                                                GCode analyzer options
+                                            </a>
+                                        </div>
+                                        <div id="analyzeOptionsAccordioinTab" class="accordion-body collapse in">
+                                            <div class="accordion-inner">
+                                                These require re-analyzing file:<br>
+                                                <input type="checkbox" id="sortLayersCheckbox" value="4" onclick="GCODE.ui.processOptions()" checked>Sort layers by Z</input><br>
+                                                <input type="checkbox" id="purgeEmptyLayersCheckbox" value="5"  onclick="GCODE.ui.processOptions()" checked>Hide empty layers</input><br>
+                                                <input type="checkbox" id="showGCodeCheckbox" value="6" onclick="GCODE.ui.processOptions()" checked>Show GCode in GCode tab (memory intensive!)</input><br>
+                                            </div>
                                         </div>
                                     </div>
+
                                 </div>
 
                             </div>
+                            <div class="tab-pane" id="term">
+                                <pre id="terminal-output" class="pre-scrollable"></pre>
+                                <label class="checkbox">
+                                    <input type="checkbox" id="terminal-autoscroll" data-bind="checked: autoscrollEnabled"> Autoscroll
+                                </label>
 
-                        </div>
-                        <div class="tab-pane" id="term">
-                            <pre id="terminal-output" class="pre-scrollable"></pre>
-                            <label class="checkbox">
-                                <input type="checkbox" id="terminal-autoscroll" data-bind="checked: autoscrollEnabled"> Autoscroll
-                            </label>
-
-                            <div class="input-append">
-                                <input type="text" id="terminal-command">
-                                <button class="btn" type="button" id="terminal-send">Send</button>
-                            </div>
-                        </div>
-                        {% if webcamStream %}
-                        <div class="tab-pane" id="webcam">
-                            <div id="webcam_container">
-                                <img id="webcam_image" src="{{ webcamStream }}">
-                            </div>
-
-                            {% if enableTimelapse %}
-                            <h1>Timelapse Configuration</h1>
-
-                            <label for="webcam_timelapse_mode">Timelapse Mode</label>
-                            <select id="webcam_timelapse_mode" data-bind="value: timelapseType, enable: isOperational() && !isPrinting()">
-                                <option value="off">Off</option>
-                                <option value="zchange">On Z Change</option>
-                                <option value="timed">Timed</option>
-                            </select>
-
-                            <div id="webcam_timelapse_timedsettings" data-bind="visible: intervalInputEnabled()">
-                                <label for="webcam_timelapse_interval">Interval</label>
                                 <div class="input-append">
-                                    <input type="text" class="input-mini" id="webcam_timelapse_interval" data-bind="value: timelapseTimedInterval, enable: isOperational() && !isPrinting()">
-                                    <span class="add-on">sec</span>
+                                    <input type="text" id="terminal-command">
+                                    <button class="btn" type="button" id="terminal-send">Send</button>
                                 </div>
                             </div>
+                            {% if enableTimelapse %}
+                            <div class="tab-pane" id="timelapse">
+                                <h1>Timelapse Configuration</h1>
 
-                            <div>
-                                <button class="btn" data-bind="click: save, enable: isOperational() && !isPrinting()">Save Settings</button>
-                            </div>
+                                <label for="webcam_timelapse_mode">Timelapse Mode</label>
+                                <select id="webcam_timelapse_mode" data-bind="value: timelapseType, enable: isOperational() && !isPrinting()">
+                                    <option value="off">Off</option>
+                                    <option value="zchange">On Z Change</option>
+                                    <option value="timed">Timed</option>
+                                </select>
 
-                            <h1>Finished Timelapses</h1>
+                                <div id="webcam_timelapse_timedsettings" data-bind="visible: intervalInputEnabled()">
+                                    <label for="webcam_timelapse_interval">Interval</label>
+                                    <div class="input-append">
+                                        <input type="text" class="input-mini" id="webcam_timelapse_interval" data-bind="value: timelapseTimedInterval, enable: isOperational() && !isPrinting()">
+                                        <span class="add-on">sec</span>
+                                    </div>
+                                </div>
 
-                            <div class="pull-right">
-                                <small>Sort by: <a href="#" data-bind="click: function() { listHelper.changeSorting('name'); }">Name (ascending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('creation'); }">Creation date (descending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('size'); }">Size (descending)</a></small>
-                            </div>
-                            <table class="table table-striped table-hover table-condensed table-hover" id="timelapse_files">
-                                <thead>
-                                <tr>
-                                    <th class="timelapse_files_name">Name</th>
-                                    <th class="timelapse_files_size">Size</th>
-                                    <th class="timelapse_files_action">Action</th>
-                                </tr>
-                                </thead>
-                                <tbody data-bind="foreach: listHelper.paginatedItems">
-                                <tr data-bind="attr: {title: name}">
-                                    <td class="timelapse_files_name" data-bind="text: name"></td>
-                                    <td class="timelapse_files_size" data-bind="text: size"></td>
-                                    <td class="timelapse_files_action"><a href="#" class="icon-trash" data-bind="click: $parent.removeFile"></a>&nbsp;|&nbsp;<a href="#" class="icon-download" data-bind="attr: {href: url}"></a></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            <div class="pagination pagination-mini pagination-centered">
-                                <ul>
-                                    <li data-bind="css: {disabled: listHelper.currentPage() === 0}"><a href="#" data-bind="click: listHelper.prevPage">«</a></li>
-                                </ul>
-                                <ul data-bind="foreach: listHelper.pages">
-                                    <li data-bind="css: { active: $data.number === $root.listHelper.currentPage(), disabled: $data.number === -1 }"><a href="#" data-bind="text: $data.text, click: function() { $root.listHelper.changePage($data.number); }"></a></li>
-                                </ul>
-                                <ul>
-                                    <li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}"><a href="#" data-bind="click: listHelper.nextPage">»</a></li>
-                                </ul>
+                                <div>
+                                    <button class="btn" data-bind="click: save, enable: isOperational() && !isPrinting()">Save Settings</button>
+                                </div>
+
+                                <h1>Finished Timelapses</h1>
+
+                                <div class="pull-right">
+                                    <small>Sort by: <a href="#" data-bind="click: function() { listHelper.changeSorting('name'); }">Name (ascending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('creation'); }">Creation date (descending)</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('size'); }">Size (descending)</a></small>
+                                </div>
+                                <table class="table table-striped table-hover table-condensed table-hover" id="timelapse_files">
+                                    <thead>
+                                    <tr>
+                                        <th class="timelapse_files_name">Name</th>
+                                        <th class="timelapse_files_size">Size</th>
+                                        <th class="timelapse_files_action">Action</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody data-bind="foreach: listHelper.paginatedItems">
+                                    <tr data-bind="attr: {title: name}">
+                                        <td class="timelapse_files_name" data-bind="text: name"></td>
+                                        <td class="timelapse_files_size" data-bind="text: size"></td>
+                                        <td class="timelapse_files_action"><a href="#" class="icon-trash" data-bind="click: $parent.removeFile"></a>&nbsp;|&nbsp;<a href="#" class="icon-download" data-bind="attr: {href: url}"></a></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <div class="pagination pagination-mini pagination-centered">
+                                    <ul>
+                                        <li data-bind="css: {disabled: listHelper.currentPage() === 0}"><a href="#" data-bind="click: listHelper.prevPage">«</a></li>
+                                    </ul>
+                                    <ul data-bind="foreach: listHelper.pages">
+                                        <li data-bind="css: { active: $data.number === $root.listHelper.currentPage(), disabled: $data.number === -1 }"><a href="#" data-bind="text: $data.text, click: function() { $root.listHelper.changePage($data.number); }"></a></li>
+                                    </ul>
+                                    <ul>
+                                        <li data-bind="css: {disabled: listHelper.currentPage() === listHelper.lastPage()}"><a href="#" data-bind="click: listHelper.nextPage">»</a></li>
+                                    </ul>
+                                </div>
                             </div>
                             {% endif %}
                         </div>
-                        {% endif %}
                     </div>
                 </div>
             </div>