Regroup widgets on makeWindow