Template tweaks and stuff