Redesign many controls