Update layouts.
Views interim
layout updates
Merge pull request #8 from cherryivy/feature/layouts

Feature/layouts