Restructured HTML for navigation + temporary styling.
Resolve merge conflict.
Merge pull request #1586 from arkon/s3-nav

Style guide part 5