Fix widgets and other issues

commenting out in one product packages should be done at last not in middle otherwise below files will be also be commented out automatically


 percy-g2 authored 5 hours ago