Rework controls positioning