Clean up menu display and edit menu display