diff --git a/ConversationsClassic/AppData/Services/Database.swift b/ConversationsClassic/AppData/Services/Database.swift
index 3a2fba4..84bc6f5 100644
--- a/ConversationsClassic/AppData/Services/Database.swift
+++ b/ConversationsClassic/AppData/Services/Database.swift
@@ -46,11 +46,11 @@ private extension Database {
     static let config: Configuration = {
         var config = Configuration()
         #if DEBUG
-            // // verbose and debugging in DEBUG builds only.
-            // config.publicStatementArguments = true
-            // config.prepareDatabase { db in
-            //     db.trace { print("SQL> \($0)\n") }
-            // }
+            // verbose and debugging in DEBUG builds only.
+            config.publicStatementArguments = true
+            config.prepareDatabase { db in
+                db.trace { print("SQL> \($0)\n") }
+            }
         #endif
         return config
     }()
diff --git a/ConversationsClassic/View/Main/Conversation/ConversationScreen.swift b/ConversationsClassic/View/Main/Conversation/ConversationScreen.swift
index 1b14f55..23077ae 100644
--- a/ConversationsClassic/View/Main/Conversation/ConversationScreen.swift
+++ b/ConversationsClassic/View/Main/Conversation/ConversationScreen.swift
@@ -28,12 +28,17 @@ struct ConversationScreen: View {
                             router.dismissScreen()
                         }
                     ),
-                    centerText: .init(text: centerText(), action: {
-                        router.showScreen(.fullScreenCover) { _ in
-                            ConversationSettingsScreen()
-                                .environmentObject(settings)
+                    centerText: .init(text: centerText()),
+                    rightButton: .init(
+                        image: Image(systemName: "gear"),
+                        action: {
+                            router.showScreen(.push) { _ in
+                                ConversationSettingsScreen()
+                                    .environmentObject(settings)
+                                    .navigationBarHidden(true)
+                            }
                         }
-                    })
+                    )
                 )
 
                 // Msg list