Better fix to navbar issue