Refactored Controls.