PinWidget Refactor