Made some changes to the drawing code for the items.