fix ToggleArrow and Crop the Text