Nav fixes

Fixes DoSomething/dosomething#1860.