Changes to structure

First attempt to match wireframe page layout.