Refactor Widgets