#109 - widget structure changed