diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
index dbbf34cb..7e6652b6 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
@@ -271,26 +271,24 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
                 case 4: // pull requests
                     fragment = new PullRequestsFragment();
                     break;
-                case 5: // commits
-                    fragment = new CommitsFragment();
-                    break;
-                case 6: // milestones
-                    return MilestonesFragment.newInstance(repoOwner, repoName);
-                case 7: // labels
-                    return LabelsFragment.newInstance(repoOwner, repoName);
-                case 8: // branches
+                case 5: // branches
                     return BranchesFragment.newInstance(repoOwner, repoName);
-                case 9: // releases
+                case 6: // releases
                     return ReleasesFragment.newInstance(repoOwner, repoName);
-                case 10: // collaborators
+                case 7: // milestones
+                    return MilestonesFragment.newInstance(repoOwner, repoName);
+                case 8: // labels
+                    return LabelsFragment.newInstance(repoOwner, repoName);
+                case 9: // collaborators
                     return CollaboratorsFragment.newInstance(repoOwner, repoName);
             }
+            assert fragment != null;
             return fragment;
         }
 
         @Override
         public int getCount() {
-            return 11;
+            return 10;
         }
 
     }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
index cd88823c..ac4e67a3 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
@@ -57,7 +57,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
     @NonNull
     @Override
     public AdminGetUsersAdapter.UsersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.admin_users_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_users, parent, false);
         return new AdminGetUsersAdapter.UsersViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
index d9b11557..472566d3 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
@@ -47,7 +47,7 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch
     @NonNull
     @Override
     public BranchesAdapter.BranchesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.branches_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_branches, parent, false);
         return new BranchesAdapter.BranchesViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
index 1360a78a..556fcb0b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
@@ -58,7 +58,7 @@ public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         LayoutInflater inflater = LayoutInflater.from(context);
 
         if(viewType == TYPE_LOAD){
-            return new ClosedIssuesAdapter.IssuesHolder(inflater.inflate(R.layout.repo_issues_list, parent,false));
+            return new ClosedIssuesAdapter.IssuesHolder(inflater.inflate(R.layout.list_issues, parent,false));
         }
         else {
             return new ClosedIssuesAdapter.LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
diff --git a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
index 7c09e695..edd0cfdd 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
@@ -61,7 +61,7 @@ public class CollaboratorsAdapter extends BaseAdapter  {
         ViewHolder viewHolder = null;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.collaborators_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_collaborators, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index 240a8421..8944cdc2 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -10,7 +10,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
@@ -155,7 +154,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
     @NonNull
     @Override
     public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repos_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
         return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
index c2fa1c53..1565fb86 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@@ -147,7 +147,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     @NonNull
     @Override
     public FilesAdapter.FilesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files, parent, false);
         return new FilesAdapter.FilesViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
index 5cd20c7a..9c71c48a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
@@ -53,7 +53,7 @@ public class FilesDiffAdapter extends RecyclerView.Adapter<FilesDiffAdapter.File
     @NonNull
     @Override
     public FilesDiffAdapter.FilesDiffViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_diffs_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files_diffs, parent, false);
         return new FilesDiffAdapter.FilesDiffViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
index 5b7eebf6..d6d634ea 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@@ -58,7 +58,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         LayoutInflater inflater = LayoutInflater.from(context);
 
         if(viewType == TYPE_LOAD){
-            return new IssuesHolder(inflater.inflate(R.layout.repo_issues_list, parent,false));
+            return new IssuesHolder(inflater.inflate(R.layout.list_issues, parent,false));
         }
         else {
             return new LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
diff --git a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
index e6200440..d4ec1ed7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -123,7 +122,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
     @NonNull
     @Override
     public LabelsAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.labels_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_labels, parent, false);
         return new LabelsAdapter.LabelsViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
index b7494b4d..a54f1f60 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
@@ -67,7 +67,7 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
         MembersByOrgAdapter.ViewHolder viewHolder = null;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_org_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_org, null);
             viewHolder = new MembersByOrgAdapter.ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
index c69d4062..b1c5af01 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@@ -110,7 +110,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
     @NonNull
     @Override
     public MilestonesAdapter.MilestonesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.milestones_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_milestones, parent, false);
         return new MilestonesAdapter.MilestonesViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
index 79b0d666..854de0c7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -26,7 +26,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -158,7 +157,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
     @NonNull
     @Override
     public MyReposListAdapter.MyReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.my_repos_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_my_repos, parent, false);
         return new MyReposListAdapter.MyReposViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
index 0aea0da4..2d77f19e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
@@ -74,7 +74,7 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
     @NonNull
     @Override
     public OrganizationsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.organizations_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_organizations, parent, false);
         return new OrganizationsViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java
index 77061f4a..4b927fe8 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java
@@ -44,7 +44,7 @@ public class ProfileEmailsAdapter extends RecyclerView.Adapter<ProfileEmailsAdap
     @NonNull
     @Override
     public ProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_emails_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_emails, parent, false);
         return new ProfileEmailsAdapter.EmailsViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
index d0030dde..29b2e736 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
@@ -47,7 +47,7 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
     @NonNull
     @Override
     public ProfileFollowersAdapter.FollowersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_followers_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_followers, parent, false);
         return new ProfileFollowersAdapter.FollowersViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
index 14b49861..1e174f78 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
@@ -47,7 +47,7 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
     @NonNull
     @Override
     public ProfileFollowingAdapter.FollowingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_following_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_following, parent, false);
         return new ProfileFollowingAdapter.FollowingViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
index 04e7e10b..c754f766 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@@ -57,7 +57,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         LayoutInflater inflater = LayoutInflater.from(context);
 
         if(viewType == TYPE_LOAD){
-            return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.repo_pr_list, parent,false));
+            return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.list_pr, parent,false));
         }
         else {
             return new PullRequestsAdapter.LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
index beed78a5..f94b3042 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@@ -80,7 +80,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
     @NonNull
     @Override
     public ReleasesAdapter.ReleasesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.releases_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_releases, parent, false);
         return new ReleasesAdapter.ReleasesViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
index afa1fe26..b07d1e65 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@@ -63,7 +63,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
         RepoStargazersAdapter.ViewHolder viewHolder;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_stargazers_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_stargazers, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
index 7d74514f..3f510daa 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@@ -63,7 +63,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
         RepoWatchersAdapter.ViewHolder viewHolder;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_watchers_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_watchers, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 2b54a4b7..308827c7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -162,7 +161,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
     @NonNull
     @Override
     public ReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repos_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
         return new ReposViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
index 711ed4c5..551b38b6 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -26,7 +26,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -159,7 +158,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
     @NonNull
     @Override
     public RepositoriesByOrgAdapter.OrgReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repositories_by_org_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories_by_org, parent, false);
         return new RepositoriesByOrgAdapter.OrgReposViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
index acd897e3..796c136a 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -159,7 +159,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
     @NonNull
     @Override
     public StarredReposListAdapter.StarredReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.starred_repos_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_starred_repos, parent, false);
         return new StarredReposListAdapter.StarredReposViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
index 0aac76c4..26e8a2b7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@@ -64,7 +64,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         TeamMembersByOrgAdapter.ViewHolder viewHolder = null;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_team_by_org_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_team_by_org, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java
index 46e8bb70..b3b7f686 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java
@@ -67,7 +67,7 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
     @NonNull
     @Override
     public TeamsByOrgAdapter.OrgTeamsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.teams_by_org_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_teams_by_org, parent, false);
         return new TeamsByOrgAdapter.OrgTeamsViewHolder(v);
     }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
index 244f486d..e05a6fc0 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
@@ -120,7 +120,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
     @NonNull
     @Override
     public UserSearchAdapter.UserSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.collaborators_list_search, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_collaborators_search, parent, false);
         return new UserSearchAdapter.UserSearchViewHolder(v);
     }
 
diff --git a/app/src/main/res/layout/activity_repo_detail.xml b/app/src/main/res/layout/activity_repo_detail.xml
index b482f8ba..ef531499 100644
--- a/app/src/main/res/layout/activity_repo_detail.xml
+++ b/app/src/main/res/layout/activity_repo_detail.xml
@@ -75,10 +75,16 @@
                 android:text="@string/tabPullRequests" />
 
             <com.google.android.material.tabs.TabItem
-                android:id="@+id/tabItemCommits"
+                android:id="@+id/tabItem5_branches"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/repositoryTabCommits" />
+                android:text="@string/tab_text_branches" />
+
+            <com.google.android.material.tabs.TabItem
+                android:id="@+id/tabItem6_releases"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/tab_text_releases" />
 
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem3_ml"
@@ -92,18 +98,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/tab_text_labels" />
 
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/tabItem5_branches"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_text_branches" />
-
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/tabItem6_releases"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_text_releases" />
-
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem7_collaborators"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/admin_users_list.xml b/app/src/main/res/layout/list_admin_users.xml
similarity index 100%
rename from app/src/main/res/layout/admin_users_list.xml
rename to app/src/main/res/layout/list_admin_users.xml
diff --git a/app/src/main/res/layout/branches_list.xml b/app/src/main/res/layout/list_branches.xml
similarity index 100%
rename from app/src/main/res/layout/branches_list.xml
rename to app/src/main/res/layout/list_branches.xml
diff --git a/app/src/main/res/layout/collaborators_list.xml b/app/src/main/res/layout/list_collaborators.xml
similarity index 100%
rename from app/src/main/res/layout/collaborators_list.xml
rename to app/src/main/res/layout/list_collaborators.xml
diff --git a/app/src/main/res/layout/collaborators_list_search.xml b/app/src/main/res/layout/list_collaborators_search.xml
similarity index 100%
rename from app/src/main/res/layout/collaborators_list_search.xml
rename to app/src/main/res/layout/list_collaborators_search.xml
diff --git a/app/src/main/res/layout/files_list.xml b/app/src/main/res/layout/list_files.xml
similarity index 100%
rename from app/src/main/res/layout/files_list.xml
rename to app/src/main/res/layout/list_files.xml
diff --git a/app/src/main/res/layout/files_diffs_list.xml b/app/src/main/res/layout/list_files_diffs.xml
similarity index 100%
rename from app/src/main/res/layout/files_diffs_list.xml
rename to app/src/main/res/layout/list_files_diffs.xml
diff --git a/app/src/main/res/layout/repo_issues_list.xml b/app/src/main/res/layout/list_issues.xml
similarity index 100%
rename from app/src/main/res/layout/repo_issues_list.xml
rename to app/src/main/res/layout/list_issues.xml
diff --git a/app/src/main/res/layout/labels_list.xml b/app/src/main/res/layout/list_labels.xml
similarity index 100%
rename from app/src/main/res/layout/labels_list.xml
rename to app/src/main/res/layout/list_labels.xml
diff --git a/app/src/main/res/layout/members_by_org_list.xml b/app/src/main/res/layout/list_members_by_org.xml
similarity index 100%
rename from app/src/main/res/layout/members_by_org_list.xml
rename to app/src/main/res/layout/list_members_by_org.xml
diff --git a/app/src/main/res/layout/members_by_team_by_org_list.xml b/app/src/main/res/layout/list_members_by_team_by_org.xml
similarity index 100%
rename from app/src/main/res/layout/members_by_team_by_org_list.xml
rename to app/src/main/res/layout/list_members_by_team_by_org.xml
diff --git a/app/src/main/res/layout/milestones_list.xml b/app/src/main/res/layout/list_milestones.xml
similarity index 100%
rename from app/src/main/res/layout/milestones_list.xml
rename to app/src/main/res/layout/list_milestones.xml
diff --git a/app/src/main/res/layout/my_repos_list.xml b/app/src/main/res/layout/list_my_repos.xml
similarity index 100%
rename from app/src/main/res/layout/my_repos_list.xml
rename to app/src/main/res/layout/list_my_repos.xml
diff --git a/app/src/main/res/layout/organizations_list.xml b/app/src/main/res/layout/list_organizations.xml
similarity index 100%
rename from app/src/main/res/layout/organizations_list.xml
rename to app/src/main/res/layout/list_organizations.xml
diff --git a/app/src/main/res/layout/repo_pr_list.xml b/app/src/main/res/layout/list_pr.xml
similarity index 100%
rename from app/src/main/res/layout/repo_pr_list.xml
rename to app/src/main/res/layout/list_pr.xml
diff --git a/app/src/main/res/layout/profile_emails_list.xml b/app/src/main/res/layout/list_profile_emails.xml
similarity index 100%
rename from app/src/main/res/layout/profile_emails_list.xml
rename to app/src/main/res/layout/list_profile_emails.xml
diff --git a/app/src/main/res/layout/profile_followers_list.xml b/app/src/main/res/layout/list_profile_followers.xml
similarity index 100%
rename from app/src/main/res/layout/profile_followers_list.xml
rename to app/src/main/res/layout/list_profile_followers.xml
diff --git a/app/src/main/res/layout/profile_following_list.xml b/app/src/main/res/layout/list_profile_following.xml
similarity index 100%
rename from app/src/main/res/layout/profile_following_list.xml
rename to app/src/main/res/layout/list_profile_following.xml
diff --git a/app/src/main/res/layout/releases_list.xml b/app/src/main/res/layout/list_releases.xml
similarity index 100%
rename from app/src/main/res/layout/releases_list.xml
rename to app/src/main/res/layout/list_releases.xml
diff --git a/app/src/main/res/layout/repo_stargazers_list.xml b/app/src/main/res/layout/list_repo_stargazers.xml
similarity index 100%
rename from app/src/main/res/layout/repo_stargazers_list.xml
rename to app/src/main/res/layout/list_repo_stargazers.xml
diff --git a/app/src/main/res/layout/repo_watchers_list.xml b/app/src/main/res/layout/list_repo_watchers.xml
similarity index 100%
rename from app/src/main/res/layout/repo_watchers_list.xml
rename to app/src/main/res/layout/list_repo_watchers.xml
diff --git a/app/src/main/res/layout/repos_list.xml b/app/src/main/res/layout/list_repos.xml
similarity index 100%
rename from app/src/main/res/layout/repos_list.xml
rename to app/src/main/res/layout/list_repos.xml
diff --git a/app/src/main/res/layout/repositories_by_org_list.xml b/app/src/main/res/layout/list_repositories_by_org.xml
similarity index 100%
rename from app/src/main/res/layout/repositories_by_org_list.xml
rename to app/src/main/res/layout/list_repositories_by_org.xml
diff --git a/app/src/main/res/layout/starred_repos_list.xml b/app/src/main/res/layout/list_starred_repos.xml
similarity index 100%
rename from app/src/main/res/layout/starred_repos_list.xml
rename to app/src/main/res/layout/list_starred_repos.xml
diff --git a/app/src/main/res/layout/teams_by_org_list.xml b/app/src/main/res/layout/list_teams_by_org.xml
similarity index 100%
rename from app/src/main/res/layout/teams_by_org_list.xml
rename to app/src/main/res/layout/list_teams_by_org.xml