Added relationships
Fixed relationship forms