Clean up and moving to portrait view