diff --git a/frontend/frontend/templates/frontend/setup.html b/frontend/frontend/templates/frontend/setup.html
index 350aa56..fc38f15 100644
--- a/frontend/frontend/templates/frontend/setup.html
+++ b/frontend/frontend/templates/frontend/setup.html
@@ -3,6 +3,46 @@
 {% load i18n %}
 
 {% block content %}
+<style>
+#st-extended .control-group {
+    margin-bottom: 0;
+} 
+#st-extended .form-horizontal .control-label {
+	padding-right: 10px;
+	width: 100px
+}
+
+#st-extended .form-horizontal .controls {
+    margin-left: 100px;
+}
+
+#st-extended  .control-group > .controls > select {
+		width: 100px;
+}
+
+/* Large desktop */
+#st-extended .form-horizontal .controls > input {
+		width: 530px
+}
+/* Portrait tablet to landscape and desktop */
+@media (min-width: 768px) and (max-width: 979px) {
+#st-extended .form-horizontal .controls > input {
+		width: 430px
+}
+}
+/* Landscape phone to portrait tablet */
+@media (max-width: 767px) {
+#st-extended .form-horizontal .controls > input {
+		width: 230px
+}
+}
+/* Landscape phones and down */
+@media (max-width: 480px) {
+#st-extended .form-horizontal .controls > input {
+		width: 130px
+}
+}
+</style>
 <div id="loader-bg"><div id="loader"></div></div>
     <div id="st-clicker" style="float: left; margin-bottom: 20px">
         <h2 style="display: inline; line-height:inherit" id="setup-tool-string">
@@ -13,38 +53,47 @@
         </h2>
     </div>
     <div id="st-extended" style="float:left; display:none">
-        <form class="form-inline">
-        <div class="input-append">
-            <label class="checkbox" style="width: 70px; margin-right:10px">Item xpath:</label>
-            <input type="text" id="ste-parent" class="input-xxlarge" placeholder="Skipped"/>
-        </div>
-        <br/>
-        <div class="input-append">
-            <label class="checkbox" style="width: 100px; padding-right:10px; text-align: right">Tille path:</label>
-            <select style="width:100px" disabled>
-                <option selected="selected">Required</option>
-                <option>Optional</option>
-            <select>
-            <input type="text" id="ste-title" class="input-xxlarge" placeholder="Skipped"/>
-        </div>
-        <br/>
-        <div class="input-append">
-            <label class="checkbox" style="width: 100px; padding-right:10px; text-align: right">Link path:</label>
-            <select style="width:100px" disabled>
-                <option>Required</option>
-                <option selected="selected">Optional</option>
-            <select>
-            <input type="text" id="ste-link"  class="input-xxlarge" placeholder="Skipped"/>
-        </div>
-        <br/>
-        <div class="input-append">
-            <label class="checkbox" style="width: 100px; padding-right:10px; text-align: right">Description path:</label>
-            <select style="width:100px" disabled>
-                <option selected="selected">Required</option>
-                <option>Optional</option>
-            <select>
-            <input type="text" id="ste-description" class="input-xxlarge" placeholder="Skipped"/>
-        </div>
+        <form class="form-horizontal">
+						<div class="control-group info">
+								<label class="control-label">Item xpath:</label>
+								<div class="controls">
+										<input type="text" id="ste-parent" placeholder="Skipped" autocomplete="off"/>
+										<span class="help-inline">Selected %s</span>
+								</div>
+						</div>
+						<div class="control-group info">
+								<label class="control-label">Title xpath:</label>
+								<div class="controls">
+										<select disabled>
+												<option selected="selected">Required</option>
+												<option>Optional</option>
+										<select>
+										<input type="text" id="ste-title" class="input-xxlarge" placeholder="Skipped" autocomplete="off"/>
+										<span class="help-inline">Selected %s</span>
+								</div>
+						</div>
+						<div class="control-group info">
+								<label class="control-label">Link xpath:</label>
+								<div class="controls">
+										<select style="width:100px" disabled>
+												<option>Required</option>
+												<option selected="selected">Optional</option>
+										<select>
+										<input type="text" id="ste-link" class="input-xxlarge" placeholder="Skipped" autocomplete="off"/>
+										<span class="help-inline">Selected %s</span>
+								</div>
+						</div>
+						<div class="control-group info">
+								<label class="control-label">Description xpath:</label>
+								<div class="controls">
+										<select style="width:100px" disabled>
+												<option selected="selected">Required</option>
+												<option>Optional</option>
+										<select>
+										<input type="text" id="ste-description" class="input-xxlarge" placeholder="Skipped" autocomplete="off"/>
+										<span class="help-inline">Selected %s</span>
+								</div>
+						</div>
         </form>
     </div>
     <div style="float:right">