Moving templates around some more