Menus are now in a correct working state, but still using the hack-ish m...

...ethod.