Fix spacing bug in navbar and change style