diff --git a/src/views/books/BookletPage.qml b/src/views/books/BookletPage.qml
index 3a4ca4c..823470f 100644
--- a/src/views/books/BookletPage.qml
+++ b/src/views/books/BookletPage.qml
@@ -1,195 +1,186 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import org.kde.mauikit 1.0 as Maui
 import org.kde.kirigami 2.7 as Kirigami
 
 Item
 {
     id: control
 
     property var currentBooklet : null
     signal exit()
 
     onCurrentBookletChanged:
     {
         editor.document.load(currentBooklet.url)
         _sidebar.title = currentBook.title
     }
 
     Maui.BaseModel
     {
         id: _bookletModel
         list: _booksList.booklet
     }
 
     Maui.Page
     {
         id: _page
         anchors.fill: parent
+        title: currentBooklet.title
+
+        headBar.rightContent: ToolButton
+        {
+            icon.name: "document-save"
+            text: qsTr("Save")
+            onClicked:
+            {
+                currentBooklet.content = editor.text
+                currentBooklet.title = title.text
+                _booksList.booklet.update(currentBooklet, _listView.currentIndex)
+            }
+        }
 
         headBar.leftContent: [
             ToolButton
             {
                 icon.name: "go-previous"
                 onClicked: control.exit()
             },
 
-            ToolButton
+            Kirigami.Separator
             {
-                icon.name: "document-save"
-                onClicked:
-                {
-                    currentBooklet.content = editor.text
-                    currentBooklet.title = title.text
-                    _booksList.booklet.update(currentBooklet, _listView.currentIndex)
-                }
+
             },
 
-            TextField
+            ToolButton
             {
-                id: title
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                //                Layout.margins: Maui.Style.space.medium
-                placeholderText: qsTr("New chapter...")
-                font.weight: Font.Bold
-                font.bold: true
-                font.pointSize: Maui.Style.fontSizes.large
-                text: currentBooklet.title
-                //            Kirigami.Theme.backgroundColor: selectedColor
-                //            Kirigami.Theme.textColor: Qt.darker(selectedColor, 2.5)
-                //            color: fgColor
-                background: Rectangle
-                {
-                    color: "transparent"
-                }
+              icon.name: "view-calendar-list"
+              text: qsTr("Chapters")
+              onClicked:
+              {
+                  console.log(_layout.visibleChildren, _layout.visibleChildren)
+                  _layout.currentIndex = 0
+              }
+
+              checked: _layout.firstVisibleItem === _sidebar
             }
         ]
 
         Maui.Holder
         {
             id: _holder
             visible: !_listView.count || !currentBooklet
             emoji: "qrc:/document-edit.svg"
             emojiSize: Maui.Style.iconSizes.huge
             isMask: false
             title : qsTr("Nothing to edit!")
             body: qsTr("Select a chapter or create a new one")
         }
 
 
         Kirigami.PageRow
         {
             id: _layout
             anchors.fill: parent
             initialPage: [_sidebar, editor]
             interactive: true
-defaultColumnWidth: Kirigami.Units.gridUnit * 13
+defaultColumnWidth: Kirigami.Units.gridUnit * 11
             Maui.Editor
             {
                 id: editor
                 visible: !_holder.visible
                 footBar.visible: false
 
             }
 
             Maui.Page
             {
 
                 id: _sidebar
                 headBar.visible: true
                 headBar.rightContent: ToolButton
                 {
                     icon.name: "view-sort"
                 }
 
                 background: Rectangle
                 {
                     color: "transparent"
                 }
 
                 Maui.Holder
                 {
                     anchors.margins: Maui.Style.space.huge
                     visible: !_listView.count
                     emoji: "qrc:/document-edit.svg"
                     emojiSize: Maui.Style.iconSizes.huge
                     isMask: false
                     title : qsTr("This book is empty!")
                     body: qsTr("Start by creating a new chapter for your book by clicking the + icon")
                 }
 
                 ListView
                 {
                     id: _listView
                     anchors.fill: parent
                     model: _bookletModel
                     clip: true
 
                     onCountChanged:
                     {
                         _listView.currentIndex = count-1
                         control.currentBooklet = _booksList.booklet.get(_listView.currentIndex)
                     }
 
                     delegate: Maui.LabelDelegate
                     {
                         id: _delegate
                         width: parent.width
                         label: index+1  + " - " + model.title
 
                         Connections
                         {
                             target:_delegate
 
                             onClicked:
                             {
                                 _listView.currentIndex = index
                                 currentBooklet =  _booksList.booklet.get(index)
                             }
                         }
                     }
                 }
 
-                Rectangle
+                Maui.FloatingButton
                 {
                     z: 999
                     anchors.bottom: parent.bottom
-                    anchors.margins: Maui.Style.space.huge
+                    anchors.margins: height
                     anchors.horizontalCenter: parent.horizontalCenter
                     height: Maui.Style.toolBarHeight
                     width: height
-
-                    color: Kirigami.Theme.positiveTextColor
-                    radius: Maui.Style.radiusV
-
-                    ToolButton
-                    {
-                        anchors.centerIn: parent
-                        icon.name: "list-add"
-                        icon.color: "white"
-                        onClicked: _newChapter.open()
-                    }
+                    Kirigami.Theme.backgroundColor: Kirigami.Theme.positiveTextColor
+                    icon.name: "list-add"
+                    icon.color: "white"
+                    onClicked: _newChapter.open()
                 }
             }
         }
 
-
-
         Maui.Dialog
         {
             id: _newChapter
 
             title: qsTr("New Chapter")
             message: qsTr("Create a new chapter for your current book. Give it a title")
             entryField: true
-
+            page.padding: Maui.Style.space.huge
             onAccepted:
             {
                 _booksList.booklet.insert({title: textEntry.text})
             }
         }
 
     }
 }