DicomViewer refactored