diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 83636c2..6a7d01a 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -77,7 +77,7 @@ script#macros-template(type="text/x-template")
                         .gcodeContainer
                                 textarea.new-gcode( :value='newGcode[tab-1]' @input="updateNewGcode")
                                 //- gcode-viewer(v-if="state.selected !== 'default'")
-                                p.new-gcode {{newGcode[tab-1]}}
+                        p.gcode-para{{newGcode[tab-1]}} 
                         button.submit-macros(title="Save Macros",@click="confirmSave=true",
                                 style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save 
                         button.submit-macros(title="Cancel Macros",@click="cancelMacros",
diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py
index 656bc4b..87dd56d 100644
--- a/src/py/bbctrl/Config.py
+++ b/src/py/bbctrl/Config.py
@@ -27,6 +27,7 @@
 
 import os
 import json
+import bbctrl.RequestHandler
 import pkg_resources
 from pkg_resources import Requirement, resource_filename
 
@@ -54,7 +55,7 @@ class Config(object):
         except Exception: self.log.exception('Internal error: Failed to load config template')
 
     def update_gcode_list(self):
-        self.values['gcodeList'] = self.get_ctrl().state.return_files()
+        self.values['gcodeList'] = bbctrl.RequestHandler.get_ctrl().state.return_files()
 
 
     def load(self):