Fixed bugs in the menu system.
Formatting