fixed a number of margin problems in navbar