updated templates & controllers for Craft