moved a bunch of links to the navbar and changed cancel to back in at least one of them