Added additional templates ; moved template ; added nav links