updating the navbar, base style
merged, resolve base.html