Reworked how menu is handled.