diff --git a/one/templates/new-template-flow.html b/one/templates/new-template-flow.html
index c75facf..645307a 100644
--- a/one/templates/new-template-flow.html
+++ b/one/templates/new-template-flow.html
@@ -10,76 +10,6 @@
         </div>
         <h2>{% blocktrans with step=1 %}Step {{step}}{% endblocktrans %}</h2>
         <p>Leírás, mit is kéne itt ezen az ablakon csinálni, és miért jó, ha azt csinálja, amit.</p>
-        <ul>
-            <li>
-            <label for="new-template-name">{% trans "Name" %}</label>
-                <input type="text" placeholder="{% trans "Short name of template" %}" name="name" id="new-template-name" />
-                <div class="clear"></div>
-            </li>
-            <li>
-            <label for="new-template-type">{% trans "Type" %}</label>
-                <ul class="radio">
-                    <li>
-                        <input type="radio" name="type" value="labor" id="new-template-type-labor" />
-                        <label for="new-template-type-labor">{% trans "Lab" %}</label>
-                    </li>
-                    <li>
-                        <input type="radio" name="type" value="project" id="new-template-type-project" />
-                        <label for="new-template-type-project">{% trans "Project" %}</label>
-                    </li>
-                </ul>
-                <div class="clear"></div>
-            </li>
-            <li>
-                <label for="new-template-size">{% trans "Size" %}</label>
-                <ul class="radio">
-                    <li>
-                        <input type="radio" name="size" value="small" id="new-template-size-small" />
-                        <label for="new-template-size-small">Kicsi</label>
-                    </li>
-                    <li>
-                        <input type="radio" name="size" value="medium" id="new-template-size-medium" />
-                        <label for="new-template-size-medium">Közepes</label>
-                    </li>
-                    <li>
-                        <input type="radio" name="size" value="large" id="new-template-size-large" />
-                        <label for="new-template-size-large">Nagy</label>
-                    </li>
-                </ul>
-                <div class="clear"></div>
-            </li>
-            <li style="border: none">
-                <label for="new-template-description">{% trans "Description" %}</label>
-                <textarea name="description" id="new-template-description" placeholder="{% trans "Comments about the template" %}"></textarea>
-                <div class="clear"></div>
-            </li>
-        </ul>
-        <nav>
-            <a href="#" class="prev">{% trans "&laquo; Cancel" %}</a>
-            <a href="#" class="next">{% trans "Next &raquo;" %}</a>
-            <div class="clear"></div>
-        </nav>
-        <script type="text/javascript">
-            $(function(){
-                $('#new-template-step-1 nav .next').click(function(){
-                    $('#new-template-step-1').hide();
-                    $('#new-template-step-2').show();
-                })
-                $('#new-template-step-1 nav .prev').click(function(){
-                    $('#modal').hide();
-                })
-            })
-        </script>
-    </div>
-    <div id="new-template-step-2" class="wizard" style="display: none">
-        <div class="progress">
-            <div class="bar-container">
-                <div class="bar" style="width: 66%"></div>
-            </div>
-            <h3>{% blocktrans with step=2 all=3 %}{{step}}/{{all}}{% endblocktrans %}</h3>
-        </div>
-        <h2>{% blocktrans with step=2 %}Step {{step}}{% endblocktrans %}</h2>
-        <p>Leírás, mit is kéne itt ezen az ablakon csinálni, és miért jó, ha azt csinálja, amit.</p>
         <div class="container">
             <ul class="wm-list modal">
                 {% for m in templates %}
@@ -135,12 +65,12 @@
                             .slideUp(700);
                 }
             });
-                $('#new-template-step-2 nav .prev').click(function(){
-                    $('#new-template-step-2').hide();
+                $('#new-template-step-1 nav .prev').click(function(){
+                    $('#new-template-step-1').hide();
                     $('#new-template-step-1').show();
                 })
-                $('#new-template-step-2 nav .next').click(function(){
-                    $('#new-template-step-2').hide();
+                $('#new-template-step-1 nav .next').click(function(){
+                    $('#new-template-step-1').hide();
                     $('#new-template-step-3').show();
                     $.ajax({
                         'type': 'POST',
@@ -152,6 +82,76 @@
             })
         </script>
     </div>
+    <div id="new-template-step-2" class="wizard" style="display: none">
+        <div class="progress">
+            <div class="bar-container">
+                <div class="bar" style="width: 66%"></div>
+            </div>
+            <h3>{% blocktrans with step=2 all=3 %}{{step}}/{{all}}{% endblocktrans %}</h3>
+        </div>
+        <h2>{% blocktrans with step=2 %}Step {{step}}{% endblocktrans %}</h2>
+        <p>Leírás, mit is kéne itt ezen az ablakon csinálni, és miért jó, ha azt csinálja, amit.</p>
+        <ul>
+            <li>
+            <label for="new-template-name">{% trans "Name" %}</label>
+                <input type="text" placeholder="{% trans "Short name of template" %}" name="name" id="new-template-name" />
+                <div class="clear"></div>
+            </li>
+            <li>
+            <label for="new-template-type">{% trans "Type" %}</label>
+                <ul class="radio">
+                    <li>
+                        <input type="radio" name="type" value="labor" id="new-template-type-labor" />
+                        <label for="new-template-type-labor">{% trans "Lab" %}</label>
+                    </li>
+                    <li>
+                        <input type="radio" name="type" value="project" id="new-template-type-project" />
+                        <label for="new-template-type-project">{% trans "Project" %}</label>
+                    </li>
+                </ul>
+                <div class="clear"></div>
+            </li>
+            <li>
+                <label for="new-template-size">{% trans "Size" %}</label>
+                <ul class="radio">
+                    <li>
+                        <input type="radio" name="size" value="small" id="new-template-size-small" />
+                        <label for="new-template-size-small">Kicsi</label>
+                    </li>
+                    <li>
+                        <input type="radio" name="size" value="medium" id="new-template-size-medium" />
+                        <label for="new-template-size-medium">Közepes</label>
+                    </li>
+                    <li>
+                        <input type="radio" name="size" value="large" id="new-template-size-large" />
+                        <label for="new-template-size-large">Nagy</label>
+                    </li>
+                </ul>
+                <div class="clear"></div>
+            </li>
+            <li style="border: none">
+                <label for="new-template-description">{% trans "Description" %}</label>
+                <textarea name="description" id="new-template-description" placeholder="{% trans "Comments about the template" %}"></textarea>
+                <div class="clear"></div>
+            </li>
+        </ul>
+        <nav>
+            <a href="#" class="prev">{% trans "&laquo; Cancel" %}</a>
+            <a href="#" class="next">{% trans "Next &raquo;" %}</a>
+            <div class="clear"></div>
+        </nav>
+        <script type="text/javascript">
+            $(function(){
+                $('#new-template-step-1 nav .next').click(function(){
+                    $('#new-template-step-1').hide();
+                    $('#new-template-step-2').show();
+                })
+                $('#new-template-step-1 nav .prev').click(function(){
+                    $('#modal').hide();
+                })
+            })
+        </script>
+    </div>
     <div id="new-template-step-3" class="wizard" style="display: none">
 
     </div>