cleaned a few things up with the navbar