Working on better button drawing