diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 2d248e3..03509da 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -216,7 +216,7 @@ script#control-view-template(type="text/x-template")
                       .bar(:style="'width:' + (progress || 0) * 100 + '%'")
 
     .macros-div(class="present")
-       button.macros-button(title="Click to run Macros",v-for="(macros, index) in config.macros",
+       button.macros-button(title="Click to run Macros",v-for="(index,macros) in config.macros",
           @click="runMacros(index)",:disabled="!is_ready",v-bind:style="{ backgroundColor: macros.color }") {{macros.name}}
 
     .tabs
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 5378386..3a66d6a 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -36,11 +36,11 @@ script#macros-template(type="text/x-template")
                 .fa.fa-plus
 
     .tabs
-        input(type="radio",v-for="(macros,index) in config.macros",:id="tab{{index}}",
+        input(type="radio",v-for="(index,macros) in config.macros",:id="tab{{index}}",
                 :name="tabs",:checked="index == 0", @click="tab=index",:key="index")
         label(:for="tab{{index}}",style="height:50px;width:100px",:key="index") Macros {{index+1}}
 
-        section.tab-content(v-for="(macros,index) in config.macros",id="content{index}}",:key="index")
+        section.tab-content(v-for="(index,macros) in config.macros",id="content{index}}",:key="index")
                 .macros-form
                         p.title Name
                         .input-container