Added Clear Data and Toggle Controls