Do search and replace to skip vendor...
Update to fancy form UI