Added nested forms and changes in controllers