Moved some stuff out of navbar into nav div