add tabs
fix up the form defs