Merged. Added new menu view and view manager for switching between them