do not merge: Ui/new menu design