Made some drawing changes