Refactored to the new widget structure