diff --git a/web/app/templates/customer-application/create.hbs b/web/app/templates/customer-application/create.hbs
index 23c0ac2..e8414ce 100644
--- a/web/app/templates/customer-application/create.hbs
+++ b/web/app/templates/customer-application/create.hbs
@@ -16,23 +16,23 @@
         <div class="widget-box transparent">
             <div class="widget-header widget-header-small">
                 <div class="widget-toolbar action-buttons">
-                    <a href="#" data-rel="tooltip" title="Add Image" {{action (route-action 'addImage')}}>
+                    {{#a-btn data-rel="tooltip" title="Add Image" click=(route-action 'addImage')}}
                         <i class="ace-icon fa fa-plus-circle green"></i>
-                    </a>
+                    {{/a-btn}}
                 </div>
             </div>
             <div class="widget-body">
                 <div class="widget-main padding-4">
-                    {{#each model.images as |image i|}}
+                    {{#each model.images as |image index|}}
                     <div class="col-xs-6 no-padding-left">
                         <div class="space-4"></div>
-                        {{input name=(concat 'imageTitles[' i ']') class='width-80' placeholder='Image title' value=image.title}}
+                        {{input name=(concat 'imageTitles[' index ']') class='width-80' placeholder='Image title' value=image.title}}
                         &nbsp;
-                        <a href="#" class="red" data-rel="tooltip" title="Remove Image" {{action (route-action 'removeImage' image)}}>
+                        {{#a-btn class="red" data-rel="tooltip" title="Remove Image" click=(route-action 'removeImage' image)}}
                             <i class="ace-icon fa fa-times bigger-125"></i>
-                        </a>
+                        {{/a-btn}}
                         <div class="space-2"></div>
-                        {{image-input name=(concat 'images[' i ']') image=image}}
+                        {{image-input name=(concat 'images[' index ']') image=image}}
                     </div>
                     {{/each}}
                 </div>
@@ -44,24 +44,24 @@
         <div class="widget-box transparent">
             <div class="widget-header widget-header-small">
                 <div class="widget-toolbar action-buttons">
-                    <a href="#" data-rel="tooltip" title="Add Attachment" {{action (route-action 'addAttachment')}}>
+                    {{#a-btn data-rel="tooltip" title="Add Attachment" click=(route-action 'addAttachment')}}
                         <i class="ace-icon fa fa-plus-circle green"></i>
-                    </a>
+                    {{/a-btn}}
                 </div>
             </div>
             <div class="widget-body">
                 <div class="widget-main padding-4">
-                    {{#each model.attachments as |attachment i|}}
+                    {{#each model.attachments as |attachment index|}}
                     <div class="col-xs-6 no-padding-left">
                         <div class="space-4"></div>
-                        {{input name=(concat 'attachmentTitles[' i ']') class='width-80' placeholder='Attachment name' value=image.title}}
+                        {{input name=(concat 'attachmentTitles[' index ']') class='width-80' placeholder='Attachment name' value=image.title}}
                         &nbsp;
-                        <a href="#" class="red" data-rel="tooltip" title="Remove Attachment" {{action (route-action 'removeAttachment' attachment)}}>
+                        {{#a-btn class="red" data-rel="tooltip" title="Remove Attachment" click=(route-action 'removeAttachment' attachment)}}
                             <i class="ace-icon fa fa-times bigger-125"></i>
-                        </a>
+                        {{/a-btn}}
                         <div class="space-2"></div>
                         {{!input type='file'}}
-                        {{file-input name=(concat 'attachments[' i ']') file=attachment}}
+                        {{file-input name=(concat 'attachments[' index ']') file=attachment}}
                     </div>
                     {{/each}}
                 </div>
diff --git a/web/app/templates/local-product/create.hbs b/web/app/templates/local-product/create.hbs
index 6457fe5..e64a507 100644
--- a/web/app/templates/local-product/create.hbs
+++ b/web/app/templates/local-product/create.hbs
@@ -20,7 +20,7 @@
                         <div class="space-4"></div>
                         {{input name=(concat 'imageTitles[' index ']') class='width-80' placeholder='Image title' value=image.title}}
                         &nbsp;
-                        {{#a-btn data-rel="tooltip" title="Remove Image" click=(route-action 'removeImage' image)}}
+                        {{#a-btn class="red" data-rel="tooltip" title="Remove Image" click=(route-action 'removeImage' image)}}
                             <i class="ace-icon fa fa-times bigger-125"></i>
                         {{/a-btn}}
                         <div class="space-2"></div>
@@ -48,7 +48,7 @@
                         <div class="space-4"></div>
                         {{input name=(concat 'attachmentTitles[' index ']') class='width-80' placeholder='Attachment name' value=image.title}}
                         &nbsp;
-                        {{#a-btn data-rel="tooltip" title="Remove Attachment" click=(route-action 'removeAttachment' attachment)}}
+                        {{#a-btn class="red" data-rel="tooltip" title="Remove Attachment" click=(route-action 'removeAttachment' attachment)}}
                             <i class="ace-icon fa fa-times bigger-125"></i>
                         {{/a-btn}}
                         <div class="space-2"></div>