some layout changes.

need to revisit partials to tidy up