final collaboration controller and form changes