Align city blocks with edge of main content area

Addresses #3551
Make fixed navbar appear above other content

Addresses #3551