-Use property split -Use sub-panels for Options panel -Slightly re-organize Options panel -Remove redundant Deflect Emitter from Options panel (it was already in the tool settings for the Comb tool)