dev-branch: Navigation bar height: fixes for when this will be approved and merget into official branch