Fix clickable and fix including the button text