Changed span to div ing input-field templates for easier styling