Align city blocks with edge of main content area

Addresses #3551
Make fixed navbar appear above other content

Addresses #3551
Merge branch '3551-theme' into 7.x-1.x
Merge branch '7.x-1.x' of https://github.com/ghing/onboard_profile into ghing-7.x-1.x