diff --git a/src/controls/Page.qml b/src/controls/Page.qml
index 4a34d72..ea76732 100644
--- a/src/controls/Page.qml
+++ b/src/controls/Page.qml
@@ -1,71 +1,71 @@
 import QtQuick 2.4
 import QtQuick.Controls 2.2
 import org.kde.mauikit 1.0 as Maui
 import org.kde.kirigami 2.7 as Kirigami
 import QtQuick.Layouts 1.3
 
 Page
 {
 	id: control
 	
 // 	property int margins: 0       
 // 	contentItem.anchors.margins: margins
 // 	contentItem.anchors.left: contentItem.parent.left
 // 	contentItem.anchors.top: contentItem.parent.top
 // 	contentItem.anchors.bottom: contentItem.parent.bottom
 // 	contentItem.anchors.right: contentItem.parent.right
 
 leftPadding: control.padding
 rightPadding: control.padding
 topPadding: control.padding
 bottomPadding: control.padding
 	
 	property alias headBar : _headBar
 	property alias footBar: _footBar
 	property QtObject mheadBar : Maui.ToolBar
 	{ 
 		id: _headBar
 		visible: count > 1
 		position: ToolBar.Header 
 		Kirigami.Theme.backgroundColor: control.Kirigami.Theme.backgroundColor	
 		
 		Component
 		{
 			id: _titleComponent
 			Label
 			{				
 				text: control.title				
 				elide : Text.ElideRight
 				font.bold : false
 				font.weight: Font.Bold
 				color : colorScheme.textColor
 				font.pointSize: fontSizes.big
 				horizontalAlignment : Text.AlignHCenter
 				verticalAlignment :  Text.AlignVCenter
 				
 			}
 		}
 		
 		middleContent: Loader
 		{
-            Layout.fillWidth: true
-            Layout.fillHeight: true
+            Layout.fillWidth: sourceComponent === _titleComponent
+            Layout.fillHeight: sourceComponent === _titleComponent
 			sourceComponent: control.title ? _titleComponent : undefined
 		}
 	}
 	
 	property QtObject mfootBar : Maui.ToolBar 
 	{ 
 		id: _footBar
 		visible: count
 		position: ToolBar.Footer
 		Kirigami.Theme.backgroundColor: control.Kirigami.Theme.backgroundColor		
 	}   
 	
 	header: headBar.position === ToolBar.Header ? headBar : undefined	
 	footer: Column 
 	{
 		id: _footer
 		children: headBar.position === ToolBar.Footer ? [footBar, headBar] : footBar		
 	}  
 }