Reorder Menu

Change-Id: I4aefee22aee76dab8df1491462e0aef213d1ce24