diff --git a/frontend/frontend/static/frontend/assets/js/help.js b/frontend/frontend/static/frontend/assets/js/help.js
index beab85f..6e22e69 100644
--- a/frontend/frontend/static/frontend/assets/js/help.js
+++ b/frontend/frontend/static/frontend/assets/js/help.js
@@ -82,6 +82,8 @@ window.onYouTubeIframeAPIReady = function() { // doesn't work
 };
 
 $(document).ready(function() {
+  if (!document.getElementById('buoy'))
+    return;
   style = document.getElementById('buoy').style;
   cont_el = document.getElementById('help');
   cont = cont_el.style;
diff --git a/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js b/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js
index 6e132c5..053a8de 100644
--- a/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js
+++ b/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js
@@ -19,8 +19,20 @@ window.ext_tool = {
     'update_ui': update_tool_ui
 };
 
-$(document).ready(function(){
+function show_ext(show) {
+    $("#st-ext-trigger")[0].style.display = show ? "inline-block" : "none";
+    $("#st-clicker-trigger")[0].style.display = !show ? "inline-block" : "none";
+    $("#st-extended")[0].style.display = !show ? "block" : "none";
+    $("#st-clicker")[0].style.display = show ? "block" : "none";
+}
 
+$(document).ready(function(){
+    $("#st-ext-trigger").click(function(){
+        show_ext(false);
+    });
+    $("#st-clicker-trigger").click(function(){
+        show_ext(true);
+    });
 
 });
 
diff --git a/frontend/frontend/templates/frontend/setup.html b/frontend/frontend/templates/frontend/setup.html
index d1532f3..79dee2a 100644
--- a/frontend/frontend/templates/frontend/setup.html
+++ b/frontend/frontend/templates/frontend/setup.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div id="loader-bg"><div id="loader"></div></div>
-    <div id="st-simple" style="float: left; display: none">
+    <div id="st-clicker" style="float: left; margin-bottom: 20px">
         <h2 style="display: inline; line-height:inherit" id="setup-tool-string">
             {% trans 'setup.you_are_creating_feed_with' %} 
             <button id="st-title" class="btn btn-large has-tooltip" title="{% trans 'setup.help' %}"
@@ -12,11 +12,11 @@
             <button id="st-description" class="btn btn-large">{% trans 'setup.description' %}</button>.
         </h2>
     </div>
-    <div id="st-complicated" style="float: left">
+    <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 path:</label>
-            <input type="text" id="c-item" />
+            <input type="text" id="ste-parent" class="input-xxlarge"/>
         </div>
         <br/>
         <div class="input-append">
@@ -25,7 +25,7 @@
                 <option selected="selected">Required</option>
                 <option>Optional</option>
             <select>
-            <input type="text" id="c-item" class="input-block-level" />
+            <input type="text" id="ste-title" class="input-xxlarge" />
         </div>
         <br/>
         <div class="input-append">
@@ -34,7 +34,7 @@
                 <option>Required</option>
                 <option selected="selected">Optional</option>
             <select>
-            <input type="text" id="c-item" />
+            <input type="text" id="ste-link"  class="input-xxlarge" />
         </div>
         <br/>
         <div class="input-append">
@@ -43,12 +43,14 @@
                 <option selected="selected">Required</option>
                 <option>Optional</option>
             <select>
-            <input type="text" id="c-item" />
+            <input type="text" id="ste-description" class="input-xxlarge" />
         </div>
         </form>
     </div>
     <div style="float:right">
-        <a id="st-hard-button" href="javascript::void()" class="has-tooltip" title="{% trans 'setup.config' %}"
+        <a id="st-clicker-trigger" href="javascript:void(0)" style="display:none" class="has-tooltip" title="{% trans 'setup.config' %}"
+            data-trigger="hover focus manual" data-animation="true"><img src="{% static 'frontend/images/target48.png' %}" /></a>
+        <a id="st-ext-trigger" href="javascript:void(0)"  style="display:inline-block" class="has-tooltip" title="{% trans 'setup.config' %}"
             data-trigger="hover focus manual" data-animation="true"><img src="{% static 'frontend/images/wrench48.png' %}" /></a>
         <button id="create" class="btn btn-large btn-primary disabled" style="" data-page-url="{{ page_url }}" data-feed-page-url="{{ feed_page_url }}">{% trans 'setup.create' %} <i class="icon-arrow-right icon-white" style="margin-top: 3px"></i></button>
     </div>