Fix button title handling