Move navbar height to navbar modifier

Change-Id: Idb06c6508b5ebb4cb1f110ad15c5b7feb0a45625