diff --git a/ninja-store/views/items.jade b/ninja-store/views/items.jade
index 89ae849..35f8163 100644
--- a/ninja-store/views/items.jade
+++ b/ninja-store/views/items.jade
@@ -19,10 +19,10 @@
             ul#employees
 
             form#myForm 
-                div.Name#input1(style='display: none')
+                div.Template_Name(style='display: none')
                     input(type='text', id='employee_name', value='name')
                     input(type='text', id='employee_salary', value='salary')
-                div.Exercise#input1(style='display: none')
+                div.Template_Exercise(style='display: none')
                     input(type='text', id='employee_name', value='Exercise')
                     input(type='text', id='employee_salary', value='Sets')
                     
diff --git a/ninja-store/views/layout.jade b/ninja-store/views/layout.jade
index 99e307f..67907ec 100644
--- a/ninja-store/views/layout.jade
+++ b/ninja-store/views/layout.jade
@@ -24,12 +24,13 @@ html
                 var newNum  = new Number(num + 1);      // the numeric ID of the new input field being added
                 
                 // create the new element via clone(), and manipulate it's ID using newNum value
-                var newElem = $("."+classname+"#input" + num).clone().attr('id', 'input' + newNum);
+                var newElem = $(".Template_"+classname).clone().attr('id', classname + newNum);
                                 
-                newElem.children(':first').attr('id', 'name' + newNum).attr('name', 'name' + newNum);
+                //is this line needed?
+                //newElem.children(':first').attr('id', 'name' + newNum).attr('name', 'name' + newNum);
                 
                 // manipulate the name/id values of the input inside the new element
-                newElem.children(':first').attr('id', 'name' + newNum).attr('name', 'name' + newNum);
+                newElem.children(':first').attr('id', classname + newNum).attr('name', 'name' + newNum);
  
                 // insert the new element after the last "duplicatable" input field
                 $("."+classname+"#input" + num).after(newElem);
@@ -40,7 +41,8 @@ html
  
                 // business rule: you can only add 5 names
                 if (newNum == 12)
-                    $('#btnAdd').prop('disabled',true);
+                    $('#btnAdd').
+                    prop('disabled',true);
              });
  
              $('.btnDel').click(function() {