updated layout based on wireframe
Merge pull request #35 from ninjascience/layout

updated layout based on wireframe