restructuring menus layout