UI change w/o reboot and navbar height

Change-Id: I017c1ccb1d4c87fb166f1e744a36690a2150468f