Fixed template layout issues
Merge branch 'master' of https://github.com/redatomstudios/GAO