Clean up navigation bar height & fix it - finnq