* Updated forms and views to be compliant with dual association
  system