diff --git a/src/Load.nim b/src/Load.nim
index a610aad..ed8ce60 100644
--- a/src/Load.nim
+++ b/src/Load.nim
@@ -22,6 +22,7 @@ const DEFAULT_CONTENT = """
 ]
 """
 
+
 type PageSave* = object
   pageName*: string
   pageContent*: JsonNode
@@ -61,7 +62,6 @@ func getGroupsFromPage*(page: PageSave): seq[GroupSave] =
       # debugEcho groupName
       # debugEcho groupContent
       result.add GroupSave(groupName: groupName, groupContent: groupContent)
-
     
 func getTasksFromGroup*(group: GroupSave): seq[TaskSave] = 
   assert group.groupContent.kind == JArray
@@ -73,5 +73,3 @@ func getTasksFromGroup*(group: GroupSave): seq[TaskSave] =
       note: task["note"].getStr,
       done: task["done"].getBool
     )
-  
-# readSaveFromFS().getPages()[0].getGroupsFromPage()[0].getTasksFromGroup.echo
diff --git a/src/Save.nim b/src/Save.nim
index 2bac11a..f66072d 100644
--- a/src/Save.nim
+++ b/src/Save.nim
@@ -12,7 +12,7 @@ proc getAllPages(tabView: TabView): seq[TabPage] =
   for i in 0..<n:
     result.add tabView.getNthPage(i)
 
-proc save*(btn: Button, tabView: TabView): void = 
+proc save*(tabView: TabView) =
   let allPages = tabView.getAllPages()
   var jsonPages: seq[JsonNode]
   for tabPage in allPages:
@@ -25,3 +25,7 @@ proc save*(btn: Button, tabView: TabView): void =
   let savePath = getHomeDir() / SAVE_DIR_NAME
   discard existsOrCreateDir(savePath)
   writeFile(savePath / "state.json", pretty(% jsonPages))
+  
+
+proc saveBtnPressed*(btn: Button, tabView: TabView) = 
+  save(tabView)
diff --git a/src/TaskManager.nim b/src/TaskManager.nim
index 07d7176..4834c39 100644
--- a/src/TaskManager.nim
+++ b/src/TaskManager.nim
@@ -1,15 +1,15 @@
 import gintro/[gtk4, gobject, gio, pango, adw, glib, gdk4]
 import std/with
 import Page
-import Types
 import AddNewPageRevealer
 import Utils 
 import Save
 import Load
 
-proc addNewPage(btn: Button, tabView: TabView) = 
-  let page = tabView.append newLabel($tabView.nPages)
-  page.title = $tabView.nPages
+proc windowOnClose(self: adw.ApplicationWindow, tabView: TabView): bool = 
+ save(tabView)
+ return gdk4.EVENT_PROPAGATE
+
 
 proc activate(app: gtk4.Application) =
   adw.init()
@@ -17,15 +17,10 @@ proc activate(app: gtk4.Application) =
   let
     window = adw.newApplicationWindow(app)
     header = adw.newHeaderBar()
-    # addNewPageBtn = newButtonFromIconName("list-add-symbolic")
     saveToJsonPageBtn = newFlatBtnWithIcon("document-save-symbolic")
-
     mainBox = newBox(Orientation.vertical, 0)
-
     tabBar = newTabBar()
-
     tabView = newTabView()
-    # taskPage1 = createPage()
 
   for loadedPage in loadedPages:
     let loadedGroups = loadedPage.getGroupsFromPage()
@@ -34,28 +29,15 @@ proc activate(app: gtk4.Application) =
       vexpand = true
       hexpand = true
     let page = tabView.append taskPage
-    page.title = loadedPage.pageName
-
+    page.title = loadedPage.pageName.cstring
 
   # add to buttons to header
   addRevealerWithEntryToHeaderBar(header, tabView)
-
   header.packStart saveToJsonPageBtn
-
-  # save to JSON connecting
-
-
-  
-
-
-  saveToJsonPageBtn.connect("clicked", save, tabView)
-
-
-
+  saveToJsonPageBtn.connect("clicked", saveBtnPressed, tabView)
   tabBar.view = tabView
   # addNewPageBtn.connect("clicked", addNewPage, tabView)
-  # window.connect("close_request", windowOnClose, page)
-
+  window.connect("close_request", windowOnClose, tabView)
 
   with mainBox: 
     append header