Refactored to portrait view