Small Changes onDraw()