Fixed PartyController and forms