Beginning changes on Layouts
Merge branch 'master' of https://github.com/felixmc/bromance