More navbar wrapper changes