Improved menu to work like mock ups