Major improvements to the menu prototype