Cleanup Navbar stuff

Change-Id: Ib660e0efd5e879a386d104441716abdf71d9fce2
More tweaks on Pie Control (2/2)

Change-Id: I18d240c2778befc98f5737a22daed03a8cab4343