Revert "Clean up navigation bar height & fix it - finnq"

This reverts commit 2b1dcf64d91c6947c5a9cb20e9cfd4eaf220d813.