diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
index 25c7211a..9237ae26 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
@@ -82,7 +82,7 @@ public class SplashActivity extends AbsBaseActivity {
         User user = App.getDatabase().userDao().getUser(PreferenceUtil.getInstance(this).getUser());
 
         if (user == null) {
-            NavigationUtil.goToLogin(this);
+            NavigationUtil.startLogin(this);
             return;
         }
 
@@ -98,12 +98,12 @@ public class SplashActivity extends AbsBaseActivity {
                 App.getApiClient().ensureWebSocket();
                 App.getApiClient().ReportCapabilities(clientCapabilities, new EmptyResponse());
 
-                NavigationUtil.goToMain(context);
+                NavigationUtil.startMain(context);
             }
 
             @Override
             public void onError(Exception exception) {
-                NavigationUtil.goToLogin(context);
+                NavigationUtil.startLogin(context);
             }
         });
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
index fb64d835..6b32e9b1 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
@@ -96,7 +96,7 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett
         setUpRecyclerView();
         setUpSongsAdapter();
         binding.artistText.setOnClickListener(v -> {
-            NavigationUtil.goToArtist(AlbumDetailActivity.this, new Artist(album));
+            NavigationUtil.startArtist(AlbumDetailActivity.this, new Artist(album));
         });
 
         setColors(DialogUtils.resolveColor(this, R.attr.defaultFooterColor));
@@ -196,7 +196,7 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett
                 super.onBackPressed();
                 return true;
             case R.id.action_go_to_artist:
-                NavigationUtil.goToArtist(this, new Artist(album));
+                NavigationUtil.startArtist(this, new Artist(album));
                 return true;
         }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java
index 3f085abd..98213ad8 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java
@@ -117,7 +117,7 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
         @Override
         public void onClick(View view) {
             Genre genre = dataSet.get(getBindingAdapterPosition());
-            NavigationUtil.goToGenre(activity, genre);
+            NavigationUtil.startGenre(activity, genre);
         }
     }
 }
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java
index 132dcec7..88232ea5 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java
@@ -165,7 +165,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
                 toggleChecked(getBindingAdapterPosition());
             } else {
                 Playlist playlist = dataSet.get(getBindingAdapterPosition());
-                NavigationUtil.goToPlaylist(activity, playlist);
+                NavigationUtil.startPlaylist(activity, playlist);
             }
         }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
index 76c1684a..b6df7d04 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
@@ -148,12 +148,12 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
             Object item = dataSet.get(getBindingAdapterPosition());
             switch (getItemViewType()) {
                 case ALBUM:
-                    NavigationUtil.goToAlbum(activity,
+                    NavigationUtil.startAlbum(activity,
                             (Album) item,
                             Pair.create(image, activity.getResources().getString(R.string.transition_album_image)));
                     break;
                 case ARTIST:
-                    NavigationUtil.goToArtist(activity,
+                    NavigationUtil.startArtist(activity,
                             (Artist) item,
                             Pair.create(image, activity.getResources().getString(R.string.transition_artist_image)));
                     break;
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
index 0b3d6b2b..26c5d41d 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
@@ -222,7 +222,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
                 toggleChecked(getBindingAdapterPosition());
             } else {
                 Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))};
-                NavigationUtil.goToAlbum(activity, dataSet.get(getBindingAdapterPosition()), albumPairs);
+                NavigationUtil.startAlbum(activity, dataSet.get(getBindingAdapterPosition()), albumPairs);
             }
         }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
index 0ab9004f..ea9e0ca4 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
@@ -194,7 +194,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
                 toggleChecked(getBindingAdapterPosition());
             } else {
                 Pair[] artistPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_artist_image))};
-                NavigationUtil.goToArtist(activity, dataSet.get(getBindingAdapterPosition()), artistPairs);
+                NavigationUtil.startArtist(activity, dataSet.get(getBindingAdapterPosition()), artistPairs);
             }
         }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java
index e5be6311..95eb56fa 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java
@@ -103,7 +103,7 @@ public class ArtistSongAdapter extends ArrayAdapter<Song> implements MaterialCab
             public boolean onMenuItemClick(MenuItem item) {
                 if (item.getItemId() == R.id.action_go_to_album) {
                     Pair[] albumPairs = new Pair[]{Pair.create(albumArt, activity.getResources().getString(R.string.transition_album_image))};
-                    NavigationUtil.goToAlbum(activity, new Album(song), albumPairs);
+                    NavigationUtil.startAlbum(activity, new Album(song), albumPairs);
                     return true;
                 }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
index 8cfb5113..6cd433a2 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
@@ -84,7 +84,7 @@ public class PlaylistSongAdapter extends AbsOffsetSongAdapter {
         protected boolean onSongMenuItemClick(MenuItem item) {
             if (item.getItemId() == R.id.action_go_to_album) {
                 Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getString(R.string.transition_album_image))};
-                NavigationUtil.goToAlbum(activity, new Album(dataSet.get(getBindingAdapterPosition() - 1)), albumPairs);
+                NavigationUtil.startAlbum(activity, new Album(dataSet.get(getBindingAdapterPosition() - 1)), albumPairs);
                 return true;
             }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
index 4e9da7c3..056e2c09 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
@@ -254,7 +254,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
                 switch (item.getItemId()) {
                     case R.id.action_go_to_album:
                         Pair[] albumPairs = new Pair[]{Pair.create(image, activity.getResources().getString(R.string.transition_album_image))};
-                        NavigationUtil.goToAlbum(activity, new Album(getSong()), albumPairs);
+                        NavigationUtil.startAlbum(activity, new Album(getSong()), albumPairs);
                         return true;
                 }
             }
diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
index cac55b04..58a98630 100644
--- a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
@@ -7,14 +7,11 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.util.NavigationUtil;
 import com.dkanada.gramophone.util.PreferenceUtil;
 
-import org.jellyfin.apiclient.interaction.EmptyResponse;
-
 public class ConfirmLogoutDialog extends DialogFragment {
     @NonNull
     public static ConfirmLogoutDialog create() {
@@ -34,7 +31,7 @@ public class ConfirmLogoutDialog extends DialogFragment {
 
                     PreferenceUtil.getInstance(requireContext()).setServer(null);
                     PreferenceUtil.getInstance(requireContext()).setUser(null);
-                    NavigationUtil.goToLogin(requireContext());
+                    NavigationUtil.startLogin(requireContext());
                 })
                 .build();
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
index 009e806b..488b859d 100644
--- a/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
@@ -70,10 +70,10 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
                 SongDetailDialog.create(song).show(getParentFragmentManager(), "SONG_DETAIL");
                 return true;
             case R.id.action_go_to_album:
-                NavigationUtil.goToAlbum(requireActivity(), new Album(song));
+                NavigationUtil.startAlbum(requireActivity(), new Album(song));
                 return true;
             case R.id.action_go_to_artist:
-                NavigationUtil.goToArtist(requireActivity(), new Artist(song));
+                NavigationUtil.startArtist(requireActivity(), new Artist(song));
                 return true;
         }
         return false;
diff --git a/app/src/main/java/com/dkanada/gramophone/helper/menu/SongMenuHelper.java b/app/src/main/java/com/dkanada/gramophone/helper/menu/SongMenuHelper.java
index 61317a79..edc01d03 100644
--- a/app/src/main/java/com/dkanada/gramophone/helper/menu/SongMenuHelper.java
+++ b/app/src/main/java/com/dkanada/gramophone/helper/menu/SongMenuHelper.java
@@ -39,10 +39,10 @@ public class SongMenuHelper {
                 SongDetailDialog.create(song).show(activity.getSupportFragmentManager(), "SONG_DETAILS");
                 return true;
             case R.id.action_go_to_album:
-                NavigationUtil.goToAlbum(activity, new Album(song));
+                NavigationUtil.startAlbum(activity, new Album(song));
                 return true;
             case R.id.action_go_to_artist:
-                NavigationUtil.goToArtist(activity, new Artist(song));
+                NavigationUtil.startArtist(activity, new Artist(song));
                 return true;
         }
         return false;
diff --git a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
index 68d54d23..ec835e34 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
@@ -41,42 +41,42 @@ public class NavigationUtil {
         context.startActivity(intent);
     }
 
-    public static void goToLogin(@NonNull final Context context) {
+    public static void startLogin(@NonNull final Context context) {
         final Intent intent = new Intent(context, LoginActivity.class);
 
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         context.startActivity(intent);
     }
 
-    public static void goToMain(@NonNull final Context context) {
+    public static void startMain(@NonNull final Context context) {
         final Intent intent = new Intent(context, MainActivity.class);
 
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         context.startActivity(intent);
     }
 
-    public static void goToArtist(@NonNull final Activity activity, final Artist artist, @Nullable Pair... sharedElements) {
+    public static void startArtist(@NonNull final Activity activity, final Artist artist, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, ArtistDetailActivity.class);
         intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST, artist);
 
         startActivitySharedElements(activity, intent, sharedElements);
     }
 
-    public static void goToAlbum(@NonNull final Activity activity, final Album album, @Nullable Pair... sharedElements) {
+    public static void startAlbum(@NonNull final Activity activity, final Album album, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, AlbumDetailActivity.class);
         intent.putExtra(AlbumDetailActivity.EXTRA_ALBUM, album);
 
         startActivitySharedElements(activity, intent, sharedElements);
     }
 
-    public static void goToGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) {
+    public static void startGenre(@NonNull final Activity activity, final Genre genre, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, GenreDetailActivity.class);
         intent.putExtra(GenreDetailActivity.EXTRA_GENRE, genre);
 
         startActivitySharedElements(activity, intent, sharedElements);
     }
 
-    public static void goToPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) {
+    public static void startPlaylist(@NonNull final Activity activity, final Playlist playlist, @Nullable Pair... sharedElements) {
         final Intent intent = new Intent(activity, PlaylistDetailActivity.class);
         intent.putExtra(PlaylistDetailActivity.EXTRA_PLAYLIST, playlist);