diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e6d08b2f..1bbd488e 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -714,7 +714,7 @@ const char* ayShapeBits[4]={
 
 #define PARAMETER modified=true; e->notifyInsChange(curIns);
 
-#define OP_MACRO(macro,macroLen,macroLoop,macroHeight,op,macroName) \
+#define OP_MACRO(macro,macroLen,macroLoop,macroHeight,op,macroName,displayHeight, displayLoop) \
   ImGui::NextColumn(); \
   ImGui::Text(macroName); \
   ImGui::SetNextItemWidth(112.0f*dpiScale); \
@@ -723,19 +723,19 @@ const char* ayShapeBits[4]={
   } \
   ImGui::NextColumn(); \
   for (int j=0; j<256; j++) { \
-    if (j>=macroLen) { \
+    if (j+macroDragScroll>=macroLen) { \
       asFloat[j]=0; \
     } else { \
-      asFloat[j]=macro[j]; \
+      asFloat[j]=macro[j+macroDragScroll]; \
     } \
-    loopIndicator[j]=(macroLoop!=-1 && j>=macroLoop); \
+    loopIndicator[j]=(macroLoop!=-1 && (j+macroDragScroll)>=macroLoop); \
   } \
   ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f)); \
   \
-  ImGui::PlotHistogram("##IOPMacro_" #op macroName,asFloat,totalFit,0,NULL,0,macroHeight,ImVec2(availableWidth,128.0f*dpiScale)); \
+  PlotCustom("##IOPMacro_" #op macroName,asFloat,totalFit,macroDragScroll,NULL,0,macroHeight,ImVec2(availableWidth,displayHeight*dpiScale)); \
   if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) { \
     macroDragStart=ImGui::GetItemRectMin(); \
-    macroDragAreaSize=ImVec2(availableWidth,128.0f*dpiScale); \
+    macroDragAreaSize=ImVec2(availableWidth,displayHeight*dpiScale); \
     macroDragMin=0; \
     macroDragMax=macroHeight; \
     macroDragLen=totalFit; \
@@ -744,14 +744,16 @@ const char* ayShapeBits[4]={
     macroDragChar=true; \
     processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y); \
   } \
-  ImGui::PlotHistogram("##IOPMacroLoop_" #op macroName,loopIndicator,totalFit,0,NULL,0,1,ImVec2(availableWidth,8.0f*dpiScale)); \
-  if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) { \
-    macroLoopDragStart=ImGui::GetItemRectMin(); \
-    macroLoopDragAreaSize=ImVec2(availableWidth,8.0f*dpiScale); \
-    macroLoopDragLen=totalFit; \
-    macroLoopDragTarget=&macroLoop; \
-    macroLoopDragActive=true; \
-    processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y); \
+  if (displayLoop) { \
+    ImGui::PlotHistogram("##IOPMacroLoop_" #op macroName,loopIndicator,totalFit,0,NULL,0,1,ImVec2(availableWidth,8.0f*dpiScale)); \
+    if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) { \
+      macroLoopDragStart=ImGui::GetItemRectMin(); \
+      macroLoopDragAreaSize=ImVec2(availableWidth,8.0f*dpiScale); \
+      macroLoopDragLen=totalFit; \
+      macroLoopDragTarget=&macroLoop; \
+      macroLoopDragActive=true; \
+      processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y); \
+    } \
   } \
   ImGui::PopStyleVar(); \
 
@@ -846,23 +848,35 @@ void FurnaceGUI::drawInsEdit() {
             snprintf(label,31,"Macros (OP%d)",i+1);
             if (ImGui::BeginTabItem(label)) {
               ImGui::PushID(i);
-              ImGui::Text("NOTE: Does not work yet!");
               ImGui::Columns(2,NULL,false);
               ImGui::SetColumnWidth(-1,128.0f*dpiScale);
               ImGui::NextColumn();
               float availableWidth=ImGui::GetContentRegionAvail().x;
-              int totalFit=MIN(255,availableWidth/(16*dpiScale));
-              OP_MACRO(ins->std.opMacros[i].arMacro,ins->std.opMacros[i].arMacroLen,ins->std.opMacros[i].arMacroLoop,31,i,"AR");
-              OP_MACRO(ins->std.opMacros[i].drMacro,ins->std.opMacros[i].drMacroLen,ins->std.opMacros[i].drMacroLoop,31,i,"DR");
-              OP_MACRO(ins->std.opMacros[i].d2rMacro,ins->std.opMacros[i].d2rMacroLen,ins->std.opMacros[i].d2rMacroLoop,31,i,"D2R");
-              OP_MACRO(ins->std.opMacros[i].rrMacro,ins->std.opMacros[i].rrMacroLen,ins->std.opMacros[i].rrMacroLoop,15,i,"RR");
-              OP_MACRO(ins->std.opMacros[i].slMacro,ins->std.opMacros[i].slMacroLen,ins->std.opMacros[i].slMacroLoop,15,i,"SL");
-              OP_MACRO(ins->std.opMacros[i].tlMacro,ins->std.opMacros[i].tlMacroLen,ins->std.opMacros[i].tlMacroLoop,127,i,"TL");
-              OP_MACRO(ins->std.opMacros[i].rsMacro,ins->std.opMacros[i].rsMacroLen,ins->std.opMacros[i].rsMacroLoop,3,i,"RS");
-              OP_MACRO(ins->std.opMacros[i].multMacro,ins->std.opMacros[i].multMacroLen,ins->std.opMacros[i].multMacroLoop,15,i,"MULT");
-              OP_MACRO(ins->std.opMacros[i].dtMacro,ins->std.opMacros[i].dtMacroLen,ins->std.opMacros[i].dtMacroLoop,7,i,"DT");
-              OP_MACRO(ins->std.opMacros[i].dt2Macro,ins->std.opMacros[i].dt2MacroLen,ins->std.opMacros[i].dt2MacroLoop,3,i,"DT2");
-              OP_MACRO(ins->std.opMacros[i].ssgMacro,ins->std.opMacros[i].ssgMacroLen,ins->std.opMacros[i].ssgMacroLoop,15,i,"SSG-EG");
+              int totalFit=MIN(127,availableWidth/(16*dpiScale));
+              if (macroDragScroll>127-totalFit) {
+                macroDragScroll=127-totalFit;
+              }
+              ImGui::SetNextItemWidth(availableWidth);
+              if (ImGui::SliderInt("##MacroScroll",&macroDragScroll,0,127-totalFit,"")) {
+                if (macroDragScroll<0) macroDragScroll=0;
+                if (macroDragScroll>127-totalFit) macroDragScroll=127-totalFit;
+              }
+              OP_MACRO(ins->std.opMacros[i].tlMacro,ins->std.opMacros[i].tlMacroLen,ins->std.opMacros[i].tlMacroLoop,127,i,"Level",128,true);
+              OP_MACRO(ins->std.opMacros[i].arMacro,ins->std.opMacros[i].arMacroLen,ins->std.opMacros[i].arMacroLoop,31,i,"Attack",64,true);
+              OP_MACRO(ins->std.opMacros[i].drMacro,ins->std.opMacros[i].drMacroLen,ins->std.opMacros[i].drMacroLoop,31,i,"Decay",64,true);
+              OP_MACRO(ins->std.opMacros[i].d2rMacro,ins->std.opMacros[i].d2rMacroLen,ins->std.opMacros[i].d2rMacroLoop,31,i,"Decay 2",64,true);
+              OP_MACRO(ins->std.opMacros[i].rrMacro,ins->std.opMacros[i].rrMacroLen,ins->std.opMacros[i].rrMacroLoop,15,i,"Release",64,true);
+              OP_MACRO(ins->std.opMacros[i].slMacro,ins->std.opMacros[i].slMacroLen,ins->std.opMacros[i].slMacroLoop,15,i,"Sustain",64,true);
+              OP_MACRO(ins->std.opMacros[i].rsMacro,ins->std.opMacros[i].rsMacroLen,ins->std.opMacros[i].rsMacroLoop,3,i,"EnvScale",32,true);
+              OP_MACRO(ins->std.opMacros[i].multMacro,ins->std.opMacros[i].multMacroLen,ins->std.opMacros[i].multMacroLoop,15,i,"Multiplier",64,true);
+              OP_MACRO(ins->std.opMacros[i].dtMacro,ins->std.opMacros[i].dtMacroLen,ins->std.opMacros[i].dtMacroLoop,7,i,"Detune",64,true);
+              OP_MACRO(ins->std.opMacros[i].dt2Macro,ins->std.opMacros[i].dt2MacroLen,ins->std.opMacros[i].dt2MacroLoop,3,i,"Detune 2",32,true);
+              OP_MACRO(ins->std.opMacros[i].ssgMacro,ins->std.opMacros[i].ssgMacroLen,ins->std.opMacros[i].ssgMacroLoop,15,i,"SSG-EG",64,true);
+              ImGui::SetNextItemWidth(availableWidth);
+              if (ImGui::SliderInt("##MacroScroll",&macroDragScroll,0,127-totalFit,"")) {
+                if (macroDragScroll<0) macroDragScroll=0;
+                if (macroDragScroll>127-totalFit) macroDragScroll=127-totalFit;
+              }
               ImGui::Columns();
               ImGui::PopID();
               ImGui::EndTabItem();
@@ -1017,6 +1031,7 @@ void FurnaceGUI::drawInsEdit() {
           if (ins->type==DIV_INS_AMIGA) {
             volMax=64;
           }
+          macroDragScroll=0;
           ImGui::PlotHistogram("##IVolMacro",asFloat,ins->std.volMacroLen,0,NULL,volMin,volMax,ImVec2(400.0f*dpiScale,200.0f*dpiScale));
           if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
             macroDragStart=ImGui::GetItemRectMin();
@@ -3530,9 +3545,10 @@ void FurnaceGUI::showError(String what) {
 void FurnaceGUI::processDrags(int dragX, int dragY) {
   if (macroDragActive) {
     if (macroDragLen>0) {
-      int x=(dragX-macroDragStart.x)*macroDragLen/macroDragAreaSize.x;
+      int x=((dragX-macroDragStart.x)*macroDragLen/macroDragAreaSize.x);
       if (x<0) x=0;
       if (x>=macroDragLen) x=macroDragLen-1;
+      x+=macroDragScroll;
       int y;
       if (macroDragBitMode) {
         y=(int)(macroDragMax-((dragY-macroDragStart.y)*(double(macroDragMax-macroDragMin)/(double)macroDragAreaSize.y)));
@@ -4282,6 +4298,7 @@ FurnaceGUI::FurnaceGUI():
   macroDragLastX(-1),
   macroDragLastY(-1),
   macroDragBitOff(0),
+  macroDragScroll(0),
   macroDragBitMode(false),
   macroDragInitialValueSet(false),
   macroDragInitialValue(false),
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 2fbf1aea..2fef2789 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -257,6 +257,7 @@ class FurnaceGUI {
   int macroDragMin, macroDragMax;
   int macroDragLastX, macroDragLastY;
   int macroDragBitOff;
+  int macroDragScroll;
   bool macroDragBitMode;
   bool macroDragInitialValueSet;
   bool macroDragInitialValue;
diff --git a/src/gui/plot_nolerp.cpp b/src/gui/plot_nolerp.cpp
index d7ba2d37..1aabab8e 100644
--- a/src/gui/plot_nolerp.cpp
+++ b/src/gui/plot_nolerp.cpp
@@ -267,3 +267,127 @@ void PlotBitfield(const char* label, const int* values, int values_count, int va
     FurnacePlotIntArrayGetterData data(values, stride);
     PlotBitfieldEx(label, &Plot_IntArrayGetter, (void*)&data, values_count, values_offset, overlay_text, bits, graph_size);
 }
+
+int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size)
+{
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    if (window->SkipItems)
+        return -1;
+
+    const ImGuiStyle& style = g.Style;
+    const ImGuiID id = window->GetID(label);
+
+    const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
+    if (frame_size.x == 0.0f)
+        frame_size.x = ImGui::CalcItemWidth();
+    if (frame_size.y == 0.0f)
+        frame_size.y = label_size.y + (style.FramePadding.y * 2);
+
+    const ImRect frame_bb(window->DC.CursorPos, window->DC.CursorPos + frame_size);
+    const ImRect inner_bb(frame_bb.Min + style.FramePadding, frame_bb.Max - style.FramePadding);
+    const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0));
+    ImGui::ItemSize(total_bb, style.FramePadding.y);
+    if (!ImGui::ItemAdd(total_bb, 0, &frame_bb))
+        return -1;
+    const bool hovered = ImGui::ItemHoverable(frame_bb, id);
+
+    // Determine scale from values if not specified
+    if (scale_min == FLT_MAX || scale_max == FLT_MAX)
+    {
+        float v_min = FLT_MAX;
+        float v_max = -FLT_MAX;
+        for (int i = 0; i < values_count; i++)
+        {
+            const float v = values_getter(data, i);
+            if (v != v) // Ignore NaN values
+                continue;
+            v_min = ImMin(v_min, v);
+            v_max = ImMax(v_max, v);
+        }
+        if (scale_min == FLT_MAX)
+            scale_min = v_min;
+        if (scale_max == FLT_MAX)
+            scale_max = v_max;
+    }
+
+    ImGui::RenderFrame(frame_bb.Min, frame_bb.Max, ImGui::GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding);
+
+    const int values_count_min = (plot_type == ImGuiPlotType_Lines) ? 2 : 1;
+    int idx_hovered = -1;
+    if (values_count >= values_count_min)
+    {
+        int res_w = ImMin((int)frame_size.x, values_count) + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0);
+        int item_count = values_count + ((plot_type == ImGuiPlotType_Lines) ? -1 : 0);
+
+        // Tooltip on hover
+        if (hovered && inner_bb.Contains(g.IO.MousePos))
+        {
+            const float t = ImClamp((g.IO.MousePos.x - inner_bb.Min.x) / (inner_bb.Max.x - inner_bb.Min.x), 0.0f, 0.9999f);
+            const int v_idx = (int)(t * item_count);
+            IM_ASSERT(v_idx >= 0 && v_idx < values_count);
+
+            const float v0 = values_getter(data, (v_idx) % values_count);
+            const float v1 = values_getter(data, (v_idx + 1) % values_count);
+            if (plot_type == ImGuiPlotType_Lines)
+                ImGui::SetTooltip("%d: %8.4g\n%d: %8.4g", v_idx, v0, v_idx + 1, v1);
+            else if (plot_type == ImGuiPlotType_Histogram)
+                ImGui::SetTooltip("%d: %8.4g", v_idx+values_display_offset, v0);
+            idx_hovered = v_idx;
+        }
+
+        const float t_step = 1.0f / (float)res_w;
+        const float inv_scale = (scale_min == scale_max) ? 0.0f : (1.0f / (scale_max - scale_min));
+
+        float v0 = values_getter(data, (0) % values_count);
+        float t0 = 0.0f;
+        ImVec2 tp0 = ImVec2( t0, 1.0f - ImSaturate((v0 - scale_min) * inv_scale) );                       // Point in the normalized space of our target rectangle
+        float histogram_zero_line_t = (scale_min * scale_max < 0.0f) ? (1 + scale_min * inv_scale) : (scale_min < 0.0f ? 0.0f : 1.0f);   // Where does the zero line stands
+
+        const ImU32 col_base = ImGui::GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLines : ImGuiCol_PlotHistogram);
+        const ImU32 col_hovered = ImGui::GetColorU32((plot_type == ImGuiPlotType_Lines) ? ImGuiCol_PlotLinesHovered : ImGuiCol_PlotHistogramHovered);
+
+        for (int n = 0; n < res_w; n++)
+        {
+            const float t1 = t0 + t_step;
+            const int v1_idx = (int)(t0 * item_count + 0.5f);
+            IM_ASSERT(v1_idx >= 0 && v1_idx < values_count);
+            const float v1 = values_getter(data, (v1_idx + 1) % values_count);
+            const ImVec2 tp1 = ImVec2( t1, 1.0f - ImSaturate((v1 - scale_min) * inv_scale) );
+
+            // NB: Draw calls are merged together by the DrawList system. Still, we should render our batch are lower level to save a bit of CPU.
+            ImVec2 pos0 = ImLerp(inner_bb.Min, inner_bb.Max, tp0);
+            ImVec2 pos1 = ImLerp(inner_bb.Min, inner_bb.Max, (plot_type == ImGuiPlotType_Lines) ? tp1 : ImVec2(tp1.x, histogram_zero_line_t));
+            if (plot_type == ImGuiPlotType_Lines)
+            {
+                window->DrawList->AddLine(pos0, pos1, idx_hovered == v1_idx ? col_hovered : col_base);
+            }
+            else if (plot_type == ImGuiPlotType_Histogram)
+            {
+                if (pos1.x >= pos0.x + 2.0f)
+                    pos1.x -= 1.0f;
+                window->DrawList->AddRectFilled(pos0, pos1, idx_hovered == v1_idx ? col_hovered : col_base);
+            }
+
+            t0 = t1;
+            tp0 = tp1;
+        }
+    }
+
+    // Text overlay
+    if (overlay_text)
+        ImGui::RenderTextClipped(ImVec2(frame_bb.Min.x, frame_bb.Min.y + style.FramePadding.y), frame_bb.Max, overlay_text, NULL, NULL, ImVec2(0.5f, 0.0f));
+
+    if (label_size.x > 0.0f)
+        ImGui::RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, inner_bb.Min.y), label);
+
+    // Return hovered index or -1 if none are hovered.
+    // This is currently not exposed in the public API because we need a larger redesign of the whole thing, but in the short-term we are making it available in PlotEx().
+    return idx_hovered;
+}
+
+void PlotCustom(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride)
+{
+    FurnacePlotArrayGetterData data(values, stride);
+    PlotCustomEx(ImGuiPlotType_Histogram, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
+}
\ No newline at end of file
diff --git a/src/gui/plot_nolerp.h b/src/gui/plot_nolerp.h
index ec4d5836..f1414fe2 100644
--- a/src/gui/plot_nolerp.h
+++ b/src/gui/plot_nolerp.h
@@ -1,4 +1,5 @@
 #include "imgui.h"
 
 void PlotNoLerp(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
-void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
\ No newline at end of file
+void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
+void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
\ No newline at end of file