diff --git a/src/ControlManager.cpp b/src/ControlManager.cpp
index 91b31b9..52265f3 100644
--- a/src/ControlManager.cpp
+++ b/src/ControlManager.cpp
@@ -1253,6 +1253,7 @@ std::string Control::inputLabel(uint id)
 //
 int Control::layoutKey(int key)
 {
+#if (GLFW_VERSION_MAJOR * 1000 + GLFW_VERSION_MINOR * 100 >= 3300) // 3.3+
     static int  _keyMap[GLFW_KEY_LAST];
     static bool _initialized = false;
     if (!_initialized) {
@@ -1283,4 +1284,7 @@ int Control::layoutKey(int key)
 
 //    fprintf(stderr, "%d pressed; converted to %d\n", key, _keyMap[key]);
     return _keyMap[key];
+#else
+    return key;
+#endif
 }
diff --git a/src/DisplaysView.cpp b/src/DisplaysView.cpp
index 7e16570..16bee6f 100644
--- a/src/DisplaysView.cpp
+++ b/src/DisplaysView.cpp
@@ -31,6 +31,7 @@
 #include "imgui_internal.h"
 
 #include "Log.h"
+#include "ImageFilter.h"
 #include "Mixer.h"
 #include "defines.h"
 #include "Source.h"
diff --git a/src/DisplaysView.h b/src/DisplaysView.h
index e8caf21..3178cf4 100644
--- a/src/DisplaysView.h
+++ b/src/DisplaysView.h
@@ -3,13 +3,14 @@
 
 #include "View.h"
 
+
 struct WindowPreview
 {
     Group *root_;
     Group *status_;
     Surface *surface_;
     Surface *render_;
-    ImageFilteringShader *shader_;
+    class ImageFilteringShader *shader_;
     Switch  *overlays_;
     Switch  *mode_;
     Handles *handles_;
diff --git a/src/FrameBufferFilter.cpp b/src/FrameBufferFilter.cpp
index 374b5c1..54f2afa 100644
--- a/src/FrameBufferFilter.cpp
+++ b/src/FrameBufferFilter.cpp
@@ -2,7 +2,6 @@
 #include "Resource.h"
 #include "Visitor.h"
 
-#include "FrameBufferFilter.h"
 #include "FrameBufferFilter.h"
 
 std::vector< std::tuple<int, int, std::string> > FrameBufferFilter::Types = {
diff --git a/src/ImGuiVisitor.cpp b/src/ImGuiVisitor.cpp
index 7b79e4e..c7e0c49 100644
--- a/src/ImGuiVisitor.cpp
+++ b/src/ImGuiVisitor.cpp
@@ -1119,8 +1119,12 @@ void ImGuiVisitor::visit (CloneSource& s)
     // link to origin source
     if ( !s.failed() ) {
         std::string label = std::string(s.origin()->initials()) + " - " + s.origin()->name();
-        if (ImGui::Button(label.c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) ))
+        if (ImGui::Button(label.c_str(), ImVec2(IMGUI_RIGHT_ALIGN, 0) )) {
             Mixer::manager().setCurrentSource(s.origin());
+
+            if (UserInterface::manager().navigator.pannelVisible())
+                UserInterface::manager().navigator.showPannelSource( Mixer::manager().indexCurrentSource() );
+        }
         ImGui::SameLine(0, IMGUI_SAME_LINE);
         ImGui::Text("Origin");
     }
diff --git a/src/ImageProcessingShader.cpp b/src/ImageProcessingShader.cpp
index 492477f..6e1aaaf 100644
--- a/src/ImageProcessingShader.cpp
+++ b/src/ImageProcessingShader.cpp
@@ -17,10 +17,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
 **/
 
-#include "defines.h"
 #include "Visitor.h"
-#include "Log.h"
-
 #include "ImageProcessingShader.h"
 
 ShadingProgram imageProcessingShadingProgram("shaders/image.vs", "shaders/imageprocessing.fs");
diff --git a/src/MediaSource.cpp b/src/MediaSource.cpp
index 10c4988..1a6ee83 100644
--- a/src/MediaSource.cpp
+++ b/src/MediaSource.cpp
@@ -20,9 +20,6 @@
 
 #include <glm/gtc/matrix_transform.hpp>
 
-#include "defines.h"
-#include "ImageShader.h"
-#include "ImageProcessingShader.h"
 #include "Resource.h"
 #include "Decorations.h"
 #include "MediaPlayer.h"
diff --git a/src/RenderView.h b/src/RenderView.h
index 146b621..80c0470 100644
--- a/src/RenderView.h
+++ b/src/RenderView.h
@@ -5,6 +5,7 @@
 #include <future>
 
 #include "View.h"
+#include "FrameBuffer.h"
 
 class RenderView : public View
 {
diff --git a/src/Source.h b/src/Source.h
index f7ed9cd..d166d99 100644
--- a/src/Source.h
+++ b/src/Source.h
@@ -8,6 +8,7 @@
 #include <list>
 
 #include "SourceList.h"
+#include "FrameBuffer.h"
 #include "View.h"
 
 #define DEFAULT_MIXING_TRANSLATION -1.f, 1.f
diff --git a/src/View.cpp b/src/View.cpp
index c131e31..fa8ecd6 100644
--- a/src/View.cpp
+++ b/src/View.cpp
@@ -26,7 +26,6 @@
 #include <sstream>
 #include <regex>
 
-
 #include "defines.h"
 #include "Settings.h"
 #include "Source.h"
diff --git a/src/View.h b/src/View.h
index 4a3d152..78ffdd0 100644
--- a/src/View.h
+++ b/src/View.h
@@ -1,10 +1,11 @@
 #ifndef VIEW_H
 #define VIEW_H
 
+#include <string>
+
 #include <glm/glm.hpp>
 
 #include "Scene.h"
-#include "FrameBuffer.h"
 
 class Session;
 class SessionFileSource;