Layout updates
Updated submodule
Merge branch 'production' of https://github.com/jamiebclark/jordancraig into production