Fixed a few bugs in the menu display