Consolidated xib files in Views directory
Refactoring & adding navigation to switch views
Added navigation and lightly refactored