Rearrange base navbar a little