All other view controllers removed
New refactored code