Some navbar fixes