changed to div element, converted to new template system
merged