Refactored view methods, added navigation methods with corresponding pragma mark