diff --git a/viewer/widgets/JFJochDiffractionImage.cpp b/viewer/widgets/JFJochDiffractionImage.cpp
index 4607be54..a9f54678 100644
--- a/viewer/widgets/JFJochDiffractionImage.cpp
+++ b/viewer/widgets/JFJochDiffractionImage.cpp
@@ -10,6 +10,7 @@
 #include <QScrollBar>
 #include <QMenu>
 #include <cmath>
+#include <QMouseEvent>
 
 // Constructor
 JFJochDiffractionImage::JFJochDiffractionImage(QWidget *parent) : JFJochImage(parent) {}
@@ -483,12 +484,6 @@ void JFJochDiffractionImage::updateOverlay() {
     }
 }
 
-void JFJochDiffractionImage::resizeEvent(QResizeEvent *event) {
-    // Call the base class implementation first
-    QGraphicsView::resizeEvent(event);
-    updateOverlay();
-}
-
 void JFJochDiffractionImage::Redraw() {
     if (!image) return;
 
diff --git a/viewer/widgets/JFJochDiffractionImage.h b/viewer/widgets/JFJochDiffractionImage.h
index 5365ca1d..0f477623 100644
--- a/viewer/widgets/JFJochDiffractionImage.h
+++ b/viewer/widgets/JFJochDiffractionImage.h
@@ -4,9 +4,7 @@
 #pragma once
 
 #include "JFJochImage.h"
-#include <QVector>
-#include "../../reader/JFJochHDF5Reader.h"
-#include "../../common/ColorScale.h"
+#include "../../reader/JFJochReaderImage.h"
 
 class JFJochDiffractionImage : public JFJochImage {
 Q_OBJECT
@@ -28,7 +26,6 @@ private:
     void mousePressEvent(QMouseEvent *event) override;  // Panning start
     void mouseMoveEvent(QMouseEvent *event) override;   // Panning interaction
     void mouseReleaseEvent(QMouseEvent *event) override;
-    void resizeEvent(QResizeEvent *event) override;
 
     void updateOverlay() override;
     void Redraw() override;
diff --git a/viewer/widgets/JFJochImage.cpp b/viewer/widgets/JFJochImage.cpp
index bc684124..c8908699 100644
--- a/viewer/widgets/JFJochImage.cpp
+++ b/viewer/widgets/JFJochImage.cpp
@@ -5,6 +5,7 @@
 
 #include <QScrollBar>
 #include <QWheelEvent>
+#include <QMouseEvent>
 
 JFJochImage::JFJochImage(QWidget *parent) : QGraphicsView(parent) {
     setDragMode(QGraphicsView::NoDrag); // Disable default drag mode
@@ -18,6 +19,9 @@ JFJochImage::JFJochImage(QWidget *parent) : QGraphicsView(parent) {
 
     // Connect the vertical scrollbar's valueChanged signal
     connect(verticalScrollBar(), &QScrollBar::valueChanged, this, &JFJochImage::onScroll);
+
+    // Optional: a sensible default colormap
+    color_scale.Select(ColorScaleEnum::Indigo);
 }
 
 void JFJochImage::onScroll(int value) {
@@ -84,3 +88,8 @@ void JFJochImage::wheelEvent(QWheelEvent *event) {
         updateOverlay();
     }
 }
+
+void JFJochImage::resizeEvent(QResizeEvent *event) {
+    QGraphicsView::resizeEvent(event);
+    updateOverlay();
+}
diff --git a/viewer/widgets/JFJochImage.h b/viewer/widgets/JFJochImage.h
index b4d0cc6e..2002a608 100644
--- a/viewer/widgets/JFJochImage.h
+++ b/viewer/widgets/JFJochImage.h
@@ -14,6 +14,7 @@ class JFJochImage : public QGraphicsView {
     virtual void Redraw() = 0;
 
     void wheelEvent(QWheelEvent* event) override;
+    void resizeEvent(QResizeEvent *event) override;
 
 protected:
     QColor feature_color = Qt::magenta;
diff --git a/viewer/widgets/JFJochSimpleImage.cpp b/viewer/widgets/JFJochSimpleImage.cpp
index 4cb8953a..29fe5534 100644
--- a/viewer/widgets/JFJochSimpleImage.cpp
+++ b/viewer/widgets/JFJochSimpleImage.cpp
@@ -4,30 +4,18 @@
 #include "JFJochSimpleImage.h"
 #include <QGraphicsScene>
 #include <QGraphicsPixmapItem>
-#include <QWheelEvent>
-#include <QScrollBar>
+#include <QMouseEvent>
 #include <QtMath>
 #include <cstring>
 #include <algorithm>
 
 #include "../../common/JFJochException.h"
 
-static inline double normalize_to_unit(double raw, double bg, double fg) {
-    const double denom = std::max(1e-12, double(fg) - double(bg));
-    double v = (raw - bg) / denom;
-    if (v < 0.0) v = 0.0;
-    if (v > 1.0) v = 1.0;
-    return v;
-}
-
 JFJochSimpleImage::JFJochSimpleImage(QWidget *parent)
     : JFJochImage(parent) {
     auto *scn = new QGraphicsScene(this);
     setScene(scn);
 
-    // Optional: a sensible default colormap
-    color_scale.Select(ColorScaleEnum::Indigo);
-
     // Keep overlays in pixel units independent of zoom (for labels font sizing)
     setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
 }
@@ -175,12 +163,6 @@ void JFJochSimpleImage::mouseReleaseEvent(QMouseEvent* event) {
     QGraphicsView::mouseReleaseEvent(event);
 }
 
-
-void JFJochSimpleImage::resizeEvent(QResizeEvent *event) {
-    QGraphicsView::resizeEvent(event);
-    // Nothing special; keep current transform and scene
-}
-
 void JFJochSimpleImage::renderImage() {
     const size_t W = image_->image.GetWidth();
     const size_t H = image_->image.GetHeight();
diff --git a/viewer/widgets/JFJochSimpleImage.h b/viewer/widgets/JFJochSimpleImage.h
index 9c08d9c9..736bb655 100644
--- a/viewer/widgets/JFJochSimpleImage.h
+++ b/viewer/widgets/JFJochSimpleImage.h
@@ -27,7 +27,6 @@ protected:
     void mousePressEvent(QMouseEvent* event) override;
     void mouseMoveEvent(QMouseEvent* event) override;
     void mouseReleaseEvent(QMouseEvent* event) override;
-    void resizeEvent(QResizeEvent* event) override;
 
 private:
     struct Label {