Tidy up layout - should move config to config.lua