ClientDetailsFragment Toggle Buttons Improved