Fixed pending Zoom bug issues. Added ActualZoom to viewport drawing