Fixed some drawing