Refactored controller methods. Changes to navigation and authentication