Moved all the navigation to the controller