fix some update issues
simplify TabbedSwappingControl