diff --git a/DapRightPanelForm.ui.qml b/DapRightPanelForm.ui.qml
index ab1f4cce3d16099741761fd3e36f3acc20a1a549..679ab58af7bd388195f642ad4a4953ff40b24864 100644
--- a/DapRightPanelForm.ui.qml
+++ b/DapRightPanelForm.ui.qml
@@ -3,38 +3,33 @@ import QtQuick.Controls 2.0
 
 Rectangle {
     id: dapRightPanel
+    
     property alias rightPanel: dapRightPanel
-//    property alias header: dapHeader
-//    property Rectangle headerData: undefined
-//    property alias childRightPanels: dapChildRightPanels
-    anchors.top: parent.top
-    anchors.bottom: parent.bottom
-    anchors.right: parent.right
-    width: 350
+    property alias header: dapHeader
+    property Item headerData: Item { }
+    property alias childRightPanels: dapChildRightPanels
+    property  Item contentItemPanel: Item { }
+    
+    rightPanel.anchors.top: parent.top
+    rightPanel.anchors.bottom: parent.bottom
+    rightPanel.anchors.right: parent.right
 
-    Rectangle
+    Item
     {
         id: dapHeader
-//        data: Rectangle
-//        {
-//            anchors.fill: parent
-
-//        }
+        data: headerData
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-//        anchors.fill: parent
-        height: 30
-        color: "blue"
     }
 
-//    StackView
-//    {
-//        id: dapChildRightPanels
-//        initialItem: parent
-//        anchors.top: dapHeader.bottom
-//        anchors.left: parent.left
-//        anchors.right: parent.right
-//        anchors.bottom: parent.bottom
-//    }
+    StackView
+    {
+        id: dapChildRightPanels
+        initialItem: contentItemPanel
+        anchors.top: dapHeader.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+    }
 }
diff --git a/DapTabForm.ui.qml b/DapTabForm.ui.qml
index 29066aec1a6c8b5dc7b7ee1c09d90cf712d88bf9..5c7045ff277f0ea9e4a5d1f4afb4dab7c0270942 100644
--- a/DapTabForm.ui.qml
+++ b/DapTabForm.ui.qml
@@ -2,11 +2,10 @@ import QtQuick 2.4
 import QtQuick.Controls 2.0
 
 Page {
-    property DapTopPanelForm topPanelForm: undefined
-    property DapScreenForm screenForm: undefined
+    property DapTopPanelForm topPanelForm: DapTopPanelForm { }
+    property DapScreenForm screenForm: DapScreenForm { }
     property alias separator: dapSeparator
     property DapRightPanelForm rightPanelForm: DapRightPanelForm { }
-//    property alias childRightPanels: dapChildRightPanels
 
     anchors.fill: parent
 
@@ -14,7 +13,6 @@ Page {
 
     contentItem:
         Rectangle {
-        anchors.fill: parent
 
         Item
         {