Minor fixes to the Menu System