Hotfix/navbar fix