#1447 - working on wrappable template
[IC] code cleanup
B1477 - updated dob to use datepicker and gender to use dropdown so is consistent throughout