Working on the navbar, still need to adjust the links