Cancel button drawing improvements and fixed some typo