Fixes on navbar