More navigation bar fixes