major rework of create tab