Fixed the toggle component and renamed