Reorganize main menu

Change-Id: I0e1406dc102a2ac88eaa8e0c92580fda15c923df