Refactored controls