Encapsulation of menu, improved menu