Wiidget refactor