diff --git a/src/bitmessagekivy/kv/msg_composer.kv b/src/bitmessagekivy/kv/msg_composer.kv
index 2825b415..02c6cdd8 100644
--- a/src/bitmessagekivy/kv/msg_composer.kv
+++ b/src/bitmessagekivy/kv/msg_composer.kv
@@ -35,7 +35,7 @@
                 BoxLayout:
                     size_hint_y: None
                     height: dp(40)
-                    CustomSpinner:
+                    IdentitySpinner:
                         id: btn
                         background_color: app.theme_cls.primary_dark
                         values: app.variable_1
diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index 01b187b8..bae07960 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -81,8 +81,8 @@
                 on_release: app.file_manager_open()
                 theme_text_color: "Custom"
                 text_color: app.theme_cls.primary_color
-                opacity: 1 if app.current_address_label() else 0
-                disabled: False if app.current_address_label() else True
+                # opacity: 1 if app.current_address_label() else 0
+                # disabled: False if app.current_address_label() else True
 
             BoxLayout:
                 id: top_box
@@ -113,11 +113,11 @@
                         pos_hint:{"x":0,"y":0}
                         option_cls: Factory.get("MySpinnerOption")
                         font_size: '12.5sp'
-                        text: app.getDefaultAccData(self)
+                        # text: app.getDefaultAccData(self)
                         color: color_font
                         background_normal: ''
                         background_color: app.theme_cls.primary_color
-                        on_text:app.getCurrentAccountData(self.text)
+                        # on_text:app.getCurrentAccountData(self.text)
                         ArrowImg:
                 NavigationItem:
                     id: inbox_cnt
@@ -203,9 +203,9 @@ MDNavigationLayout:
 
     MDTopAppBar:
         id: toolbar
-        title: app.current_address_label()
-        opacity: 1 if app.addressexist() else 0
-        disabled: False if app.addressexist() else True
+        # title: app.current_address_label()
+        # opacity: 1 if app.addressexist() else 0
+        # disabled: False if app.addressexist() else True
         pos_hint: {"top": 1}
         md_bg_color: app.theme_cls.primary_color
         elevation: 10
@@ -232,8 +232,8 @@ MDNavigationLayout:
         #     id:sc9
         # MyAddress:
         #     id:id_myaddress
-        AddressBook:
-            id:id_addressbook
+        # AddressBook:
+        #     id:id_addressbook
         Payment:
             id:id_payment
         # NetworkStat:
@@ -273,7 +273,7 @@ MDNavigationLayout:
     MDTextField:
         id: search_field
         hint_text: 'Search'
-        on_text: app.searchQuery(self)
+        # on_text: app.searchQuery(self)
         canvas.before:
             Color:
                 rgba: (0,0,0,1)
@@ -300,7 +300,7 @@ MDNavigationLayout:
         elevation_normal: 8
         md_bg_color: [0.941, 0, 0,1]
         on_press: app.root.ids.scr_mngr.current = 'create'
-        on_press: app.clear_composer()
+        # on_press: app.clear_composer()
 
 
 <SwipeToDeleteItem>:
diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index 1f17d542..d9a4665e 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -258,9 +258,9 @@ class NavigateApp(MDApp):
                     self.kivy_state_obj.association, android_path)
                 )
             else:
-                if not os.path.exists(self.image_dir.image_dir + '/default_identicon/'):
-                    os.makedirs(self.image_dir.image_dir + '/default_identicon/')
-                newImg.save(self.image_dir.image_dir + '/default_identicon/{0}.png'.format(
+                if not os.path.exists(self.image_dir + '/default_identicon/'):
+                    os.makedirs(self.image_dir + '/default_identicon/')
+                newImg.save(self.image_dir + '/default_identicon/{0}.png'.format(
                     self.kivy_state_obj.association)
                 )
             self.load_selected_Image(self.kivy_state_obj.association)
@@ -277,7 +277,7 @@ class NavigateApp(MDApp):
     def load_selected_Image(self, curerentAddr):
         """This method load the selected image on screen"""
         top_box_obj = self.root.ids.content_drawer.ids.top_box.children[0]
-        top_box_obj.source = self.image_dir.image_dir + '/default_identicon/{0}.png'.format(curerentAddr)
+        top_box_obj.source = self.image_dir + '/default_identicon/{0}.png'.format(curerentAddr)
         self.root.ids.content_drawer.ids.reset_image.opacity = 1
         self.root.ids.content_drawer.ids.reset_image.disabled = False
         top_box_obj.reload()
@@ -285,7 +285,7 @@ class NavigateApp(MDApp):
     def rest_default_avatar_img(self):
         """set default avatar generated image"""
         self.set_identicon(self.kivy_state_obj.association)
-        img_path = self.image_dir.image_dir + '/default_identicon/{}.png'.format(
+        img_path = self.image_dir + '/default_identicon/{}.png'.format(
             self.kivy_state_obj.association
         )
         try:
@@ -303,14 +303,14 @@ class NavigateApp(MDApp):
             first_addr = self.identity_list[0]
             if config.getboolean(str(first_addr), 'enabled'):
                 if os.path.exists(
-                    self.image_dir.imageDir + '/default_identicon/{}.png'.format(first_addr)):
-                    return self.image_dir.imageDir + '/default_identicon/{}.png'.format(
-                            first_addr)
+                    self.image_dir + '/default_identicon/{}.png'.format(first_addr)
+                ):
+                    return self.image_dir + '/default_identicon/{}.png'.format(first_addr)
                 else:
                     img = identiconGeneration.generate(first_addr)
                     instance.texture = img.texture
                     return
-        return self.image_dir.imageDir + '/drawer_logo1.png'
+        return self.image_dir + '/drawer_logo1.png'
 
     def reset_login_screen(self):
         """This method is used for clearing the widgets of random screen"""