Navbar hide

Change-Id: I8ffcfec4a66d7636121e397bb2b264bfb9c06202
Reorder NavBar menu

Change-Id: I24239314c5837e2b3b98c3c36fcbdc890de2b443