Fixing up group form code