Overhaul of Menu system, general cleanup
Overhaul of Menu System