Tidy Up form builder