Super Widget Refactoring done.