Re-organised widgets system.