Widget structure should be fine now