Added capybara test; cleaned up navigation