More registration template tweaking