Template updates

mostly just a few link changes