Clean up navbar to be more explicit

Fix #735