diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index bae07960..99aacdd0 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -81,9 +81,6 @@
                 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
-
             BoxLayout:
                 id: top_box
                 size_hint_y: None
@@ -113,11 +110,9 @@
                         pos_hint:{"x":0,"y":0}
                         option_cls: Factory.get("MySpinnerOption")
                         font_size: '12.5sp'
-                        # text: app.getDefaultAccData(self)
                         color: color_font
                         background_normal: ''
                         background_color: app.theme_cls.primary_color
-                        # on_text:app.getCurrentAccountData(self.text)
                         ArrowImg:
                 NavigationItem:
                     id: inbox_cnt
@@ -203,9 +198,6 @@ MDNavigationLayout:
 
     MDTopAppBar:
         id: toolbar
-        # 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
@@ -216,38 +208,16 @@ MDNavigationLayout:
         id: scr_mngr
         size_hint_y: None
         height: root.height - toolbar.height
-        # Inbox:
-        #     id:sc1
-        # Create:
-        #     id:sc3
-        # Sent:
-        #     id:sc4
-        # Trash:
-        #     id:sc5
         Login:
             id:sc6
         Random:
             id:id_newidentity
-        # Setting:
-        #     id:sc9
-        # MyAddress:
-        #     id:id_myaddress
-        # AddressBook:
-        #     id:id_addressbook
         Payment:
             id:id_payment
-        # NetworkStat:
-        #     id:id_network
         MailDetail:
             id:sc14
         ShowQRCode:
             id:id_showqrcode
-        # Draft:
-        #     id:sc16
-        # Allmails:
-        #     id:sc17
-        # ScanScreen:
-        #     id:is_scanscreen
 
     MDNavigationDrawer:
         id: nav_drawer
@@ -273,7 +243,6 @@ MDNavigationLayout:
     MDTextField:
         id: search_field
         hint_text: 'Search'
-        # on_text: app.searchQuery(self)
         canvas.before:
             Color:
                 rgba: (0,0,0,1)
@@ -300,7 +269,6 @@ 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()
 
 
 <SwipeToDeleteItem>: