Nav bar fixing

all fixed, good to pull