some restructuring of setup form