Revert "Make navbar left dependent on navbar"

This reverts commit b2c41bd94fb39899d58e32df8265de0afd22951d.

Change-Id: I70f2a75eed04816753764308689251fbc699d766