Reorganize state layout
Simple UI wrapper for the main menus.