Changes to layout (by James)
Merge branch 'master' of https://github.com/ekowabaka/wyf into HEAD