Fixed branch so that it works with the 'Widgets' lab.