Refactoring
Changed gadget's datatemplate