Cleaned up Widget controller.