Modified the navbar
merge css