restructure controls