diff --git a/app/src/main/java/cc/niushuai/dididone/MainActivity.java b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
index 29a07a1..6ce3c31 100644
--- a/app/src/main/java/cc/niushuai/dididone/MainActivity.java
+++ b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
@@ -2,7 +2,6 @@ package cc.niushuai.dididone;
 
 import android.os.Bundle;
 import android.view.Menu;
-import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.LayoutInflaterCompat;
@@ -13,7 +12,6 @@ import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
 
 import com.google.android.material.navigation.NavigationView;
-import com.google.android.material.snackbar.Snackbar;
 import com.mikepenz.community_material_typeface_library.CommunityMaterial;
 import com.mikepenz.devicon_typeface_library.DevIcon;
 import com.mikepenz.fontawesome_typeface_library.FontAwesome;
@@ -80,7 +78,7 @@ public class MainActivity extends AppCompatActivity {
     @Override
     public boolean onSupportNavigateUp() {
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
-        return NavigationUI.navigateUp(navController, mAppBarConfiguration)
-                || super.onSupportNavigateUp();
+        boolean navigateUp = NavigationUI.navigateUp(navController, mAppBarConfiguration);
+        return navigateUp || super.onSupportNavigateUp();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/home/HomeFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java
similarity index 56%
rename from app/src/main/java/cc/niushuai/dididone/ui/home/HomeFragment.java
rename to app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java
index 1b8a184..0785090 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/home/HomeFragment.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java
@@ -1,4 +1,4 @@
-package cc.niushuai.dididone.ui.home;
+package cc.niushuai.dididone.ui.calendar;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,22 +10,22 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
-import cc.niushuai.dididone.databinding.FragmentHomeBinding;
+import cc.niushuai.dididone.databinding.FragmentCalendarBinding;
 
-public class HomeFragment extends Fragment {
+public class CalendarFragment extends Fragment {
 
-    private FragmentHomeBinding binding;
+    private FragmentCalendarBinding binding;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        HomeViewModel homeViewModel =
-                new ViewModelProvider(this).get(HomeViewModel.class);
+        CalendarViewModel calendarViewModel =
+                new ViewModelProvider(this).get(CalendarViewModel.class);
 
-        binding = FragmentHomeBinding.inflate(inflater, container, false);
+        binding = FragmentCalendarBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
 
         final TextView textView = binding.textHome;
-        homeViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
+        calendarViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
         return root;
     }
 
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/home/HomeViewModel.java b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarViewModel.java
similarity index 61%
rename from app/src/main/java/cc/niushuai/dididone/ui/home/HomeViewModel.java
rename to app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarViewModel.java
index 1448870..03573c1 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/home/HomeViewModel.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarViewModel.java
@@ -1,16 +1,16 @@
-package cc.niushuai.dididone.ui.home;
+package cc.niushuai.dididone.ui.calendar;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class HomeViewModel extends ViewModel {
+public class CalendarViewModel extends ViewModel {
 
     private final MutableLiveData<String> mText;
 
-    public HomeViewModel() {
+    public CalendarViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("This is home fragment");
+        mText.setValue("This is calendar fragment");
     }
 
     public LiveData<String> getText() {
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/gallery/GalleryFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
similarity index 56%
rename from app/src/main/java/cc/niushuai/dididone/ui/gallery/GalleryFragment.java
rename to app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
index d199e83..d67359a 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/gallery/GalleryFragment.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
@@ -1,4 +1,4 @@
-package cc.niushuai.dididone.ui.gallery;
+package cc.niushuai.dididone.ui.setting;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,22 +10,22 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
-import cc.niushuai.dididone.databinding.FragmentGalleryBinding;
+import cc.niushuai.dididone.databinding.FragmentSettingBinding;
 
-public class GalleryFragment extends Fragment {
+public class SettingFragment extends Fragment {
 
-    private FragmentGalleryBinding binding;
+    private FragmentSettingBinding binding;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        GalleryViewModel galleryViewModel =
-                new ViewModelProvider(this).get(GalleryViewModel.class);
+        SettingViewModel settingViewModel =
+                new ViewModelProvider(this).get(SettingViewModel.class);
 
-        binding = FragmentGalleryBinding.inflate(inflater, container, false);
+        binding = FragmentSettingBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
 
-        final TextView textView = binding.textGallery;
-        galleryViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
+        final TextView textView = binding.textSlideshow;
+        settingViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
         return root;
     }
 
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/gallery/GalleryViewModel.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingViewModel.java
similarity index 61%
rename from app/src/main/java/cc/niushuai/dididone/ui/gallery/GalleryViewModel.java
rename to app/src/main/java/cc/niushuai/dididone/ui/setting/SettingViewModel.java
index ee590ac..5d2a0d8 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/gallery/GalleryViewModel.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingViewModel.java
@@ -1,16 +1,16 @@
-package cc.niushuai.dididone.ui.gallery;
+package cc.niushuai.dididone.ui.setting;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class GalleryViewModel extends ViewModel {
+public class SettingViewModel extends ViewModel {
 
     private final MutableLiveData<String> mText;
 
-    public GalleryViewModel() {
+    public SettingViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("This is gallery fragment");
+        mText.setValue("This is setting fragment");
     }
 
     public LiveData<String> getText() {
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/slideshow/SlideshowFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticFragment.java
similarity index 56%
rename from app/src/main/java/cc/niushuai/dididone/ui/slideshow/SlideshowFragment.java
rename to app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticFragment.java
index 343652f..b753c7c 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/slideshow/SlideshowFragment.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticFragment.java
@@ -1,4 +1,4 @@
-package cc.niushuai.dididone.ui.slideshow;
+package cc.niushuai.dididone.ui.statistic;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,22 +10,22 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
-import cc.niushuai.dididone.databinding.FragmentSlideshowBinding;
+import cc.niushuai.dididone.databinding.FragmentStatisticBinding;
 
-public class SlideshowFragment extends Fragment {
+public class StatisticFragment extends Fragment {
 
-    private FragmentSlideshowBinding binding;
+    private FragmentStatisticBinding binding;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        SlideshowViewModel slideshowViewModel =
-                new ViewModelProvider(this).get(SlideshowViewModel.class);
+        StatisticViewModel statisticViewModel =
+                new ViewModelProvider(this).get(StatisticViewModel.class);
 
-        binding = FragmentSlideshowBinding.inflate(inflater, container, false);
+        binding = FragmentStatisticBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
 
-        final TextView textView = binding.textSlideshow;
-        slideshowViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
+        final TextView textView = binding.textGallery;
+        statisticViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
         return root;
     }
 
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/slideshow/SlideshowViewModel.java b/app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticViewModel.java
similarity index 60%
rename from app/src/main/java/cc/niushuai/dididone/ui/slideshow/SlideshowViewModel.java
rename to app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticViewModel.java
index da77abd..fe376de 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/slideshow/SlideshowViewModel.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/statistic/StatisticViewModel.java
@@ -1,16 +1,16 @@
-package cc.niushuai.dididone.ui.slideshow;
+package cc.niushuai.dididone.ui.statistic;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class SlideshowViewModel extends ViewModel {
+public class StatisticViewModel extends ViewModel {
 
     private final MutableLiveData<String> mText;
 
-    public SlideshowViewModel() {
+    public StatisticViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("This is slideshow fragment");
+        mText.setValue("This is statistic fragment");
     }
 
     public LiveData<String> getText() {
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_calendar.xml
similarity index 89%
rename from app/src/main/res/layout/fragment_home.xml
rename to app/src/main/res/layout/fragment_calendar.xml
index f3d9b08..5256ebb 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.home.HomeFragment">
+    tools:context=".ui.calendar.CalendarFragment">
 
     <TextView
         android:id="@+id/text_home"
diff --git a/app/src/main/res/layout/fragment_slideshow.xml b/app/src/main/res/layout/fragment_setting.xml
similarity index 89%
rename from app/src/main/res/layout/fragment_slideshow.xml
rename to app/src/main/res/layout/fragment_setting.xml
index 2141a33..a099f62 100644
--- a/app/src/main/res/layout/fragment_slideshow.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.slideshow.SlideshowFragment">
+    tools:context=".ui.setting.SettingFragment">
 
     <TextView
         android:id="@+id/text_slideshow"
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_statistic.xml
similarity index 89%
rename from app/src/main/res/layout/fragment_gallery.xml
rename to app/src/main/res/layout/fragment_statistic.xml
index 643fe25..3fa4067 100644
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_statistic.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.gallery.GalleryFragment">
+    tools:context=".ui.statistic.StatisticFragment">
 
     <TextView
         android:id="@+id/text_gallery"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 6e89fb2..16ca443 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -7,19 +7,19 @@
 
     <fragment
         android:id="@id/n_nav_calendar"
-        android:name="cc.niushuai.dididone.ui.home.HomeFragment"
+        android:name="cc.niushuai.dididone.ui.calendar.CalendarFragment"
         android:label="@string/n_menu_name_calendar"
-        tools:layout="@layout/fragment_home" />
+        tools:layout="@layout/fragment_calendar" />
 
     <fragment
         android:id="@id/n_nav_statistic"
-        android:name="cc.niushuai.dididone.ui.gallery.GalleryFragment"
+        android:name="cc.niushuai.dididone.ui.statistic.StatisticFragment"
         android:label="@string/n_menu_name_statistic"
-        tools:layout="@layout/fragment_gallery" />
+        tools:layout="@layout/fragment_statistic" />
 
     <fragment
         android:id="@id/n_nav_setting"
-        android:name="cc.niushuai.dididone.ui.slideshow.SlideshowFragment"
+        android:name="cc.niushuai.dididone.ui.setting.SettingFragment"
         android:label="@string/n_menu_name_setting"
-        tools:layout="@layout/fragment_slideshow" />
+        tools:layout="@layout/fragment_setting" />
 </navigation>
\ No newline at end of file