Improving navbar and header