Updated the bitmap drawing to include proper clipping