Revert "Navigation Bar height"

This reverts commit c7d77bb6ee2af321d1de052e3087392532cbbb97.
Experimenting with layouts
Merge remote-tracking branch 'origin/5.0' into dark1