Overhaul of widget forms part II