All navigation and storyboard refactored
Storyboard changed