diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoriteListFragment.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoriteListFragment.java
index 5935ad9..27e8427 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoriteListFragment.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoriteListFragment.java
@@ -82,9 +82,6 @@ public class GeofavoriteListFragment extends GeofavoritesFragment implements Sor
 
         homeToolbar.setOnClickListener(view -> updateToolbars(false));
 
-        AppCompatImageButton menuButton = v.findViewById(R.id.menu_button);
-        menuButton.setOnClickListener(view -> ((MainActivity)requireActivity()).openDrawer());
-
         // Setup list
         int sortRule = SettingsManager.getGeofavoriteListSortBy(requireContext());
 
diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoritesFragment.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoritesFragment.java
index be51b06..08fb599 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoritesFragment.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoritesFragment.java
@@ -3,10 +3,13 @@ package it.danieleverducci.nextcloudmaps.fragments;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -30,6 +33,7 @@ public abstract class GeofavoritesFragment extends Fragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Load data
         mGeofavoritesFragmentViewModel = new ViewModelProvider(this).get(GeofavoritesFragmentViewModel.class);
         mGeofavoritesFragmentViewModel.init(requireContext());
 
@@ -43,6 +47,15 @@ public abstract class GeofavoritesFragment extends Fragment {
         });
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        // Set views
+        AppCompatImageButton menuButton = view.findViewById(R.id.menu_button);
+        menuButton.setOnClickListener(v -> ((MainActivity)requireActivity()).openDrawer());
+    }
+
     @Override
     public void onStart() {
         super.onStart();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a22be09..236f9f5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -68,9 +68,11 @@
                         android:id="@+id/app_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginRight="20dp"
                         android:layout_centerVertical="true"
                         android:layout_toEndOf="@id/logo"
                         android:ellipsize="end"
+                        android:lines="2"
                         android:fontFamily="sans-serif-light"
                         android:gravity="center_vertical"
                         android:text="@string/app_name"