diff --git a/AdvancedDockingSystem/AdvancedDockingSystem.pri b/AdvancedDockingSystem/AdvancedDockingSystem.pri
index 76e9016af..d596bc7a3 100644
--- a/AdvancedDockingSystem/AdvancedDockingSystem.pri
+++ b/AdvancedDockingSystem/AdvancedDockingSystem.pri
@@ -22,3 +22,6 @@ HEADERS += \
 	$$PWD/include/ads/FloatingWidget.h \
 	$$PWD/include/ads/Internal.h \
 	$$PWD/include/ads/Serialization.h
+
+INCLUDEPATH += $$PWD/include
+DEPENDPATH += $$PWD/include
diff --git a/AdvancedDockingSystem/src/API.cpp b/AdvancedDockingSystem/src/API.cpp
index 1cf8a784b..2327820a4 100644
--- a/AdvancedDockingSystem/src/API.cpp
+++ b/AdvancedDockingSystem/src/API.cpp
@@ -12,15 +12,18 @@ ADS_NAMESPACE_BEGIN
 
 static bool splitterContainsSectionWidget(QSplitter* splitter)
 {
-	for (int i = 0; i < splitter->count(); ++i)
+    for (int i=0; i<splitter->count(); ++i)
 	{
 		QWidget* w = splitter->widget(i);
-		QSplitter* sp = qobject_cast<QSplitter*>(w);
-		SectionWidget* sw = NULL;
+        QSplitter* sp = qobject_cast<QSplitter*>(w);
 		if (sp && splitterContainsSectionWidget(sp))
+        {
 			return true;
-		else if ((sw = qobject_cast<SectionWidget*>(w)) != NULL)
+        }
+        else if (qobject_cast<SectionWidget*>(w) != nullptr)
+        {
 			return true;
+        }
 	}
 	return false;
 }
@@ -49,49 +52,57 @@ void deleteEmptySplitter(ContainerWidget* container)
 
 ContainerWidget* findParentContainerWidget(QWidget* w)
 {
-	ContainerWidget* cw = 0;
-	QWidget* next = w;
-	do
-	{
-		if ((cw = dynamic_cast<ContainerWidget*>(next)) != 0)
-		{
-			break;
-		}
-		next = next->parentWidget();
-	}
-	while (next);
+    ContainerWidget* cw = nullptr;
+    if (w)
+    {
+        QWidget* next = w;
+        do
+        {
+            if ((cw = dynamic_cast<ContainerWidget*>(next)) != nullptr)
+            {
+                break;
+            }
+            next = next->parentWidget();
+        } while (next);
+    }
+
 	return cw;
 }
 
 SectionWidget* findParentSectionWidget(class QWidget* w)
 {
-	SectionWidget* cw = 0;
-	QWidget* next = w;
-	do
-	{
-		if ((cw = dynamic_cast<SectionWidget*>(next)) != 0)
-		{
-			break;
-		}
-		next = next->parentWidget();
-	}
-	while (next);
+    SectionWidget* cw = nullptr;
+    if (w)
+    {
+        QWidget* next = w;
+        do
+        {
+            if ((cw = dynamic_cast<SectionWidget*>(next)) != nullptr)
+            {
+                break;
+            }
+            next = next->parentWidget();
+        } while (next);
+    }
+
 	return cw;
 }
 
 QSplitter* findParentSplitter(class QWidget* w)
 {
-	QSplitter* cw = 0;
-	QWidget* next = w;
-	do
-	{
-		if ((cw = dynamic_cast<QSplitter*>(next)) != 0)
-		{
-			break;
-		}
-		next = next->parentWidget();
-	}
-	while (next);
+    QSplitter* cw = nullptr;
+    if (w)
+    {
+        QWidget* next = w;
+        do
+        {
+            if ((cw = dynamic_cast<QSplitter*>(next)) != nullptr)
+            {
+                break;
+            }
+            next = next->parentWidget();
+        } while (next);
+    }
 	return cw;
 }
 
diff --git a/AdvancedDockingSystem/src/ContainerWidget.cpp b/AdvancedDockingSystem/src/ContainerWidget.cpp
index 9036c77d3..1d818c136 100644
--- a/AdvancedDockingSystem/src/ContainerWidget.cpp
+++ b/AdvancedDockingSystem/src/ContainerWidget.cpp
@@ -41,7 +41,7 @@ ContainerWidget::ContainerWidget(QWidget *parent) :
 	_dropOverlay(new DropOverlay(this))
 {
 	_mainLayout = new QGridLayout();
-	_mainLayout->setContentsMargins(9, 9, 9, 9);
+    _mainLayout->setContentsMargins(1, 1, 1, 1);
 	_mainLayout->setSpacing(0);
 	setLayout(_mainLayout);
 }
diff --git a/AdvancedDockingSystem/src/SectionTitleWidget.cpp b/AdvancedDockingSystem/src/SectionTitleWidget.cpp
index d74eb04af..09822c921 100644
--- a/AdvancedDockingSystem/src/SectionTitleWidget.cpp
+++ b/AdvancedDockingSystem/src/SectionTitleWidget.cpp
@@ -264,8 +264,8 @@ void SectionTitleWidget::mouseMoveEvent(QMouseEvent* ev)
 	{
 		ev->accept();
 
-		int left, top, right, bottom;
-		getContentsMargins(&left, &top, &right, &bottom);
+        //int left, top, right, bottom;
+        //getContentsMargins(&left, &top, &right, &bottom);
 		QPoint moveToPos = mapToParent(ev->pos()) - _dragStartPos;
 		moveToPos.setY(0/* + top*/);
 		move(moveToPos);