Refactored navigation, partials and added controllers.