couple more tweaks to new component forms