update markup to fix layout

- change class name on `.container` in header
- fix markup causing nesting problem with content container