Re-arrange the navig bar

Change-Id: Icf8653d1959ca8f719958bd058d3e1ea23244884