Branding page and nav fixes

(branched off of PR #13, so merge that one first)

Fixes #1