Nav fixes

Fixes DoSomething/dosomething#1860. Fixes DoSomething/dosomething#1579.