Controls screen rework