Reorganization of menu