Massive overhaul of widget forms