fixing validation errors, sorting out conflicting div ids in Shield template.