Rearange Menu

Change-Id: I16d0a46eca9a60d35ac115e2eda688c251f357dd