Adjust some Bugs on Nav Bar