Revert "Sidebar Fixes"

This reverts commit 6653798d27.

damus/ContentView.swift

@@ -260,10 +260,9 @@ struct ContentView: View {
     }
     
     var body: some View {
-        ZStack() {
+        VStack(alignment: .leading, spacing: 0) {
             if let damus = self.damus_state {
                 NavigationView {
-                    VStack(alignment: .leading, spacing: 0) {
                     ZStack {
                         TabView { // Prevents navbar appearance change on scroll
                             MainContent(damus: damus)
@@ -307,20 +306,16 @@ struct ContentView: View {
                         }
                         .tabViewStyle(.page(indexDisplayMode: .never))
                     }
+                    .overlay(
+                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
+                    )
+                }
+                .navigationViewStyle(.stack)
             
                 TabBar(new_events: $home.new_events, selected: $selected_timeline, isSidebarVisible: $isSideBarOpened, action: switch_timeline)
                     .padding([.bottom], 8)
             }
-                    .overlay(
-                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
-                    )
-                    .navigationBarTitleDisplayMode(.inline)
         }
-                .navigationViewStyle(.stack)
-                
-            }
-        }
-        
         .onAppear() {
             self.connect()
             setup_notifications()

damus/Views/SideMenuView.swift

@@ -166,13 +166,8 @@ struct SideMenuView: View {
     
     @ViewBuilder
     func navLabel(title: String, systemImage: String) -> some View {
-        Label {
-            Text(title)
+        Label(title, systemImage: systemImage)
             .font(.title2)
-        } icon: {
-            Image(systemName: systemImage)
-                .frame(width:20)
-        }
             .foregroundColor(textColor())
             .frame(maxWidth: .infinity, alignment: .leading)
     }