diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e87fd12..c29aac2 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -9,24 +9,25 @@ set(plaYUver_App_SRCS
 # Main
     main.cpp
     plaYUVerApp.cpp
-    VideoHandle.cpp
-    QualityHandle.cpp
-    ModulesHandle.cpp
-    PlaYUVerAppModuleIf.cpp
-    GridManager.cpp
-    Settings.cpp
-# Sub Window
     SubWindowHandle.cpp
+    Settings.cpp
+# Module Video
     VideoSubWindow.cpp
     ViewArea.cpp
+    VideoHandle.cpp
+    FramePropertiesSidebar.cpp
+# Module Quality
+    QualityHandle.cpp
+    QualityMeasurementSidebar.cpp
+# Module Plugins
+    ModulesHandle.cpp
+    ModuleHandleDock.cpp
+    PlaYUVerAppModuleIf.cpp
+    GridManager.cpp
 # Dialogs
     AboutDialog.cpp
     ConfigureFormatDialog.cpp
     DialogSubWindowSelector.cpp
-# Docks / Sidebars
-    ModuleHandleDock.cpp
-    PropertiesSidebar.cpp
-    QualityMeasurementSidebar.cpp
 # Widgets
     HistogramWidget.cpp
     WidgetFrameNumber.cpp
diff --git a/app/PropertiesSidebar.cpp b/app/FramePropertiesSidebar.cpp
similarity index 98%
rename from app/PropertiesSidebar.cpp
rename to app/FramePropertiesSidebar.cpp
index 9b17a6f..f6b18b9 100644
--- a/app/PropertiesSidebar.cpp
+++ b/app/FramePropertiesSidebar.cpp
@@ -18,27 +18,18 @@
  */
 
 /**
- * \file     PropertiesSidebar.cpp
+ * \file     FramePropertiesSideBar.cpp
  * \brief    Main side bar definition
  */
 
 #include <cmath>
 #include <QtGui>
 #include <QtDebug>
-#include "PropertiesSidebar.h"
+#include "FramePropertiesSidebar.h"
 
 namespace plaYUVer
 {
 
-static inline QSize bestSize( QSize currSize )
-{
-  QSize bestSize( 180, currSize.height() );
-  if( currSize.width() < bestSize.width() )
-    return bestSize;
-  else
-    return currSize;
-}
-
 FramePropertiesSideBar::FramePropertiesSideBar( QWidget* parent, Bool* pbMainPlaySwitch ) :
         QWidget( parent ),
         pbMainPlaySwitch( pbMainPlaySwitch )
@@ -262,7 +253,11 @@ FramePropertiesSideBar::~FramePropertiesSideBar()
 
 QSize FramePropertiesSideBar::sizeHint() const
 {
-  return bestSize( size() );
+  QSize currSize = size();
+  QSize bestSize( 180, currSize.height() );
+  if( currSize.width() < bestSize.width() )
+    return bestSize;
+  return currSize;
 }
 
 Void FramePropertiesSideBar::setData( PlaYUVerFrame* pcFrame, Bool isPlaying )
@@ -392,7 +387,7 @@ Void FramePropertiesSideBar::updateDataHistogram()
       // image is the same in Image Viewer, then compute too the histogram
       // for this selection.
       // New frame required to separate from the thread
-      histogramWidget->updateData( new PlaYUVerFrame(m_pcFrame), NULL );
+      histogramWidget->updateData( m_pcFrame, NULL );
       fullImageButton->hide();
       selectionImageButton->hide();
     }
diff --git a/app/PropertiesSidebar.h b/app/FramePropertiesSidebar.h
similarity index 95%
rename from app/PropertiesSidebar.h
rename to app/FramePropertiesSidebar.h
index 1baf5ad..86e4969 100644
--- a/app/PropertiesSidebar.h
+++ b/app/FramePropertiesSidebar.h
@@ -18,12 +18,12 @@
  */
 
 /**
- * \file     PropertiesSidebar.h
+ * \file     FramePropertiesSidebar.h
  * \brief    Main side bar definition
  */
 
-#ifndef __PROPERTIESSIDEBAR_H__
-#define __PROPERTIESSIDEBAR_H__
+#ifndef __FRAMEPROPERTIESSIDEBAR_H__
+#define __FRAMEPROPERTIESSIDEBAR_H__
 
 #include "config.h"
 #include "lib/PlaYUVerDefs.h"
@@ -132,4 +132,4 @@ private Q_SLOTS:
 
 }   // NAMESPACE
 
-#endif // __PROPERTIESSIDEBAR_H__
+#endif // __FRAMEPROPERTIESSIDEBAR_H__
diff --git a/app/VideoHandle.h b/app/VideoHandle.h
index edb3d90..b88bbc1 100644
--- a/app/VideoHandle.h
+++ b/app/VideoHandle.h
@@ -34,7 +34,7 @@
 #endif
 #include "VideoSubWindow.h"
 #include "WidgetFrameNumber.h"
-#include "PropertiesSidebar.h"
+#include "FramePropertiesSidebar.h"
 
 namespace plaYUVer
 {
diff --git a/app/plaYUVerApp.h b/app/plaYUVerApp.h
index b02fa76..9160046 100644
--- a/app/plaYUVerApp.h
+++ b/app/plaYUVerApp.h
@@ -41,7 +41,6 @@
 #include "VideoHandle.h"
 #include "QualityHandle.h"
 #include "ModulesHandle.h"
-#include "PropertiesSidebar.h"
 #include "AboutDialog.h"
 #include "WidgetFrameNumber.h"
 
diff --git a/lib/PlaYUVerFrameStats.cpp b/lib/PlaYUVerFrameStats.cpp
index 44619f7..7822254 100644
--- a/lib/PlaYUVerFrameStats.cpp
+++ b/lib/PlaYUVerFrameStats.cpp
@@ -43,7 +43,7 @@ PlaYUVerFrameStats::PlaYUVerFrameStats() :
 PlaYUVerFrameStats::~PlaYUVerFrameStats()
 {
   if( m_pdHistogram )
-    delete[] m_pdHistogram;
+    freeMem1D( m_pdHistogram );
 
 }
 
diff --git a/lib/PlaYUVerStream.cpp b/lib/PlaYUVerStream.cpp
index ee743ff..7256f5a 100644
--- a/lib/PlaYUVerStream.cpp
+++ b/lib/PlaYUVerStream.cpp
@@ -254,6 +254,7 @@ Void PlaYUVerStream::close()
 #ifdef USE_FFMPEG
   if( m_uiStreamHandler == FFMPEG )
     m_cLibAvContext->closeAvFormat();
+    delete m_cLibAvContext;
 #endif
 
   if( m_ppcFrameBuffer )