fixing widget structure