reorganisation of form, added menus, stored server info and datzasource info