Split out the Image/Canvas from ViewerScreen into a separate widget for both ViewerScreen & PaintScreen. Removed some unused imports.