Refactroing and cleanup widget selections.