added prefrence conditionals back into the views
cleaned up preference conditionals in templates, added form validation to email advisor