Fixing checkboxes
Removing unrelated relations
Refactoring repository, adding group support to forms