Menu

Fix ISSUE#553: menu re-arrange