Code
 - Update the naming of menu view
 - Refine the menu related instances that manager holds
 - Fix integration test and unit tests.

UI:
To address UI review comment for edge case.