Fixed button drawing issue