Merge "Making the default toggle look clickable again"