#617 Improve navbar design in default styles