Redesign more controls