Some template changes and stuff