Design 1.3

+Cleanup of mockups and a few bugs fixed in other menus