Custom click listener not preserved and unsmooth font issue fixes