Improved widgets registration