some minor reformating and minor improvements all over
WIP new menu system
Un-broke the menu with some duct tape