diff --git a/src/ui/gui/gui.py b/src/ui/gui/gui.py
index 08e0c0d..0d48990 100644
--- a/src/ui/gui/gui.py
+++ b/src/ui/gui/gui.py
@@ -23,7 +23,7 @@ def __init__(self, memo_service, user_service, image_service):
         self.frames = [{}]
 
         self.__memo_view = MemoView(
-            self.__screen_available, self.__memo_service, self.__image_service, self.__user, self.objects, self.layouts, self.frames)
+            self.__screen_available, self.__memo_service, self.__image_service, self.__user, self.objects, self.layouts, self.frames, self.__app)
         self.__login_view = LoginView(
             self.__screen_available, self.__user_service, self.__user, self.objects, self.layouts, self.frames)
 
diff --git a/src/ui/gui/login_view.py b/src/ui/gui/login_view.py
index 6dec73e..7dd8364 100644
--- a/src/ui/gui/login_view.py
+++ b/src/ui/gui/login_view.py
@@ -20,13 +20,13 @@ def initialize(self):
         self.__initialize_create_user()
 
         self.setWindowTitle('Muistio')
-        self.setGeometry(2760, 1360, 1080, 800)  # used for dev purposes only
+        # self.setGeometry(2760, 1360, 1080, 800)  # used for dev purposes only
         width = 400
         height = 600
         width_pos = self.__screen_width//2 - width//2
         height_pos = self.__screen_height//2 - height//2
 
-        # self.setGeometry(width_pos, height_pos, width, height)
+        self.setGeometry(width_pos, height_pos, width, height)
 
         self.layout.addWidget(self.frames[0]["login"])
         self.layout.addWidget(self.frames[0]["create_new_user"])
diff --git a/src/ui/gui/memo_view.py b/src/ui/gui/memo_view.py
index 65e396b..caef1f9 100644
--- a/src/ui/gui/memo_view.py
+++ b/src/ui/gui/memo_view.py
@@ -7,7 +7,7 @@
 
 
 class MemoView(QFrame):
-    def __init__(self, screen, memo_service, image_service, user, objects, layouts, frames):
+    def __init__(self, screen, memo_service, image_service, user, objects, layouts, frames, app):
         super().__init__()
         self.__screen_width, self.__screen_height = screen
         self.__active_width = 1650 if self.__screen_width > 1650 else self.__screen_width
@@ -25,6 +25,7 @@ def __init__(self, screen, memo_service, image_service, user, objects, layouts,
         self.user = user
         self.memos = []
         self.testing_memo = get_empty_memo()
+        self.__app = app
 
         self.main_menu_handlers = {
             "show_memo": "toot",
@@ -49,11 +50,12 @@ def initialize(self):
         self.__initialize_mainmenu()
 
         self.setWindowTitle('Muistio')
-        self.setGeometry(2760, 1360, 1080, 800)  # used for dev purposes only
+        # self.setGeometry(2760, 1360, 1080, 800)  # used for dev purposes only
         width_pos = self.__screen_width//2 - self.__active_width//2
         height_pos = self.__screen_height//2 - self.__active_height//2
 
-        # self.setGeometry(width_pos, height_pos, self.__active_width, self.__active_height)
+        self.setGeometry(width_pos, height_pos,
+                         self.__active_width, self.__active_height)
 
         self.layout.addWidget(self.frames[0]["mainmenu"], 0, 0)
         # self.layout.addLayout(self.layouts[0]["editor"], 0, 1)
@@ -452,7 +454,7 @@ def __handle_add_image_to_db(self):
 
     def __handle_add_image_filedialog(self):
         filename, _ = QFileDialog.getOpenFileName(
-            self, "Add image", "~/", "Image files (*.jpg *.jpeg *.png *.gif *.svg)")
+            self.frames[0]["image_selector_add"], "Add image", "~/", "Image files (*.jpg *.jpeg *.png *.gif *.svg)")
 
         self.objects[0]["image_selector_add"]["file_loc_edit"].setText(
             filename)
@@ -521,10 +523,7 @@ def __save_memo(self):
         updated_memo = self.memo_service.update(
             self.__editor_memo.id, self.__editor_memo.author.id, title, content, self.__editor_memo.date)
         if updated_memo:
-            self.__set_viewer_memo(updated_memo)
-            self.frames[0]["editor"].hide()
-            self.frames[0]["viewer"].show()
-            self.__active_screen = "viewer"
+            self.__show_memo(updated_memo.id)
 
     def __handle_new_memo(self):
         title = self.objects[0]["new_memo"]["title_edit"].text()