Fix JSon format + custom_draw method