Cleanups to navigation. Use Capybara for testing.