forms setup, some ui tweaks, commit before table add