Fix Bug 950868 - Combine clip addition methods into single form UI.

WIP