Modified the navbar and some ui changes