Few more tweaks to widget js and html