Clean up membership display in forms