diff --git a/src/controls/Page.qml b/src/controls/Page.qml
index 8cfe78e..f40aeb1 100644
--- a/src/controls/Page.qml
+++ b/src/controls/Page.qml
@@ -1,240 +1,244 @@
 /*
  *   Copyright 2018 Camilo Higuita <milo.h@aol.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.10
 import QtQuick.Controls 2.10
 import QtQuick.Layouts 1.3
 import org.kde.mauikit 1.0 as Maui
 import org.kde.kirigami 2.7 as Kirigami
 import QtQuick.Layouts 1.3
 
 Page
 {
     id: control
     focus: true
     leftPadding: control.padding
     rightPadding: control.padding
     topPadding: control.padding
     bottomPadding: control.padding
     
     Kirigami.Theme.colorSet: Kirigami.Theme.View
     
     property bool showTitle : true
     
     property Flickable flickable : null
     property int footerPositioning : Kirigami.Settings.isMobile && flickable ? ListView.PullBackHeader : ListView.InlineFooter
     property int headerPositioning : Kirigami.Settings.isMobile && flickable ? ListView.PullBackHeader : ListView.InlineHeader
     
     signal goBackTriggered()
     signal goForwardTriggered()	
     
     background: Rectangle
     {
         color: Kirigami.Theme.backgroundColor
     }
     
     Connections 
     {
         target: control.flickable ? control.flickable : null
         enabled: control.flickable && (control.header || control.footer)
         property int oldContentY
         property bool updatingContentY: false        
         
         onContentYChanged:
         {            
             if(control.flickable.atYBeginning && !control.flickable.dragging)
             {
-                control.header.y = 0
-                control.footer.height = control.footer.implicitHeight
+                if(control.header)
+                    control.header.y = 0
+                    
+                    if(control.footer)
+                        control.footer.height = control.footer.implicitHeight
+                        
                 oldContentY = 0
                 updatingContentY = false
                 return;
             }                
             
             if (updatingContentY || !control.flickable)
             {
                 oldContentY = control.flickable.contentY;
                 return;
                 //TODO: merge
                 //if moves but not dragging, just update oldContentY
             } else if (!control.flickable.dragging) 
             {
                 oldContentY = control.flickable.contentY;    
                 return;
             }
             
             
             if (control.footerPositioning === ListView.InlineFooter && control.footer)
             {
                 control.footer.height =  control.footer.implicitHeight
                 
             } else if (control.footerPositioning === ListView.PullBackFooter && control.footer)
             {
                 var oldFHeight = control.footer.height;
                 
                 control.footer.height = Math.max(0,
                                                  Math.min(control.footer.implicitHeight,
                                                           control.footer.height + oldContentY - control.flickable.contentY));
                 
                 //if the implicitHeight is changed, use that to simulate scroll
                 if (oldFHeight !== control.footer.height) {
                     updatingContentY = true;
                     updatingContentY = false;
                 } else {
                     oldContentY = control.flickable.contentY;
                 }
             }
             
             if (control.headerPositioning === ListView.InlineHeader && control.header)
             {
                 control.header.y = 0;
                 
             } else if (control.headerPositioning === ListView.PullBackHeader && control.header)
             {
                 var oldHY = control.header.y                   
                 
                 control.header.y = Math.max(-(control.header.implicitHeight),
                                             Math.min(0, control.header.y + oldContentY - control.flickable.contentY));                   
                 
                 if (oldHY !== control.header.y) {
                     updatingContentY = true;
                     control.flickable.contentY -= (oldHY - control.header.y);                                                               
                     updatingContentY = false;
                 } else {
                     oldContentY = control.flickable.contentY;
                 }
             }
         }
         
         onMovementEnded:
         {
             if (control.headerPositioning === ListView.PullBackHeader && control.header)
             {
                 if (control.header.y > -(control.header.implicitHeight/2) ) 
                 {
                     control.header.y = 0;
                 } else 
                 {
                     control.header.y = -(control.header.implicitHeight)
                 }
             }
             
             if (control.footerPositioning === ListView.PullBackFooter && control.header)
             {
                 if (control.footer.height > (control.footer.implicitHeight/2) ) 
                 {
                     control.footer.height =  control.footer.implicitHeight
                     
                 } else 
                 {
                     control.footer.height = 0
                 }
             }            
         }
     }
     
     property alias headBar : _headBar
     property alias footBar: _footBar
     property Maui.ToolBar mheadBar : Maui.ToolBar
     { 
         id: _headBar
         visible: count > 1 
         width: control.width
         height: implicitHeight + y
         position: ToolBar.Header 
         
         readonly property int preferredHeight: Maui.Style.toolBarHeight
         
         Component
         {
             id: _titleComponent
             Label
             {
                 text: control.title
                 elide : Text.ElideRight
                 font.bold : false
                 font.weight: Font.Bold
                 color : Kirigami.Theme.textColor
                 font.pointSize: Maui.Style.fontSizes.big
                 horizontalAlignment : Text.AlignHCenter
                 verticalAlignment :  Text.AlignVCenter                
             }
         }
         
         middleContent: Loader
         {
             Layout.fillWidth: sourceComponent === _titleComponent
             Layout.fillHeight: sourceComponent === _titleComponent
             sourceComponent: control.title && control.showTitle ? _titleComponent : undefined
         }
     }
     
     property Maui.ToolBar mfootBar : Maui.ToolBar 
     { 
         id: _footBar
         visible: count 
         position: ToolBar.Footer
           width: control.width
           height: implicitHeight
     }   
 
     header: headBar.count && headBar.position === ToolBar.Header ? headBar : null
     
     footer: Column 
     {
         id: _footer
         visible : children 
         children:
         {
 			if(headBar.position === ToolBar.Footer && headBar.count && footBar.count)
 				return [footBar , headBar]
 				else if(headBar.position === ToolBar.Footer && headBar.count)
 					return [headBar]
 					else if(footBar.count)
 						return [footBar]
 						else
 							return []
         }
     }
     
     
     Keys.onBackPressed:
     {
         control.goBackTriggered();
         event.accepted = true
     }
     
     Shortcut
     {
         sequence: "Forward"
         onActivated: control.goForwardTriggered();
     }
     
     Shortcut
     {
         sequence: StandardKey.Forward
         onActivated: control.goForwardTriggered();
     }
     
     Shortcut
     {
         sequence: StandardKey.Back
         onActivated: control.goBackTriggered();
     }
 }