Update layout to new templates, removing a lot of stuff
Merge branch 'master' of github.com:mrquincle/aim_modules