Change drawRect to draw width and height

Change drawRect to draw width and height rather than width - 1 and height
- 1.