diff --git a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
index 8097eb09..7733c2d1 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
@@ -11,6 +11,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.models.NotificationThread;
 import java.util.List;
 
@@ -24,9 +27,11 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 	private List<NotificationThread> notificationThreads;
 	private OnMoreClickedListener onMoreClickedListener;
 	private OnNotificationClickedListener onNotificationClickedListener;
+	private TinyDB tinyDb;
 
 	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
 
+		this.tinyDb = new TinyDB(context);
 		this.context = context;
 		this.notificationThreads = notificationThreads;
 		this.onMoreClickedListener = onMoreClickedListener;
@@ -101,7 +106,33 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 
 		}
 
-		holder.frame.setOnClickListener(v -> onNotificationClickedListener.onNotificationClicked(notificationThread));
+		holder.frame.setOnClickListener(v -> {
+
+			onNotificationClickedListener.onNotificationClicked(notificationThread);
+
+			String[] parts = notificationThread.getRepository().getFullname().split("/");
+			final String repoOwner = parts[0];
+			final String repoName = parts[1];
+
+			int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+			RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+			Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+			if(count == 0) {
+
+				long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+				tinyDb.putLong("repositoryId", id);
+
+			}
+			else {
+
+				Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+				tinyDb.putLong("repositoryId", data.getRepositoryId());
+
+			}
+		});
+
 		holder.more.setOnClickListener(v -> onMoreClickedListener.onMoreClicked(notificationThread));
 
 	}
diff --git a/app/src/main/res/layout/activity_repo_stargazers.xml b/app/src/main/res/layout/activity_repo_stargazers.xml
index 55317cfc..dccd8d22 100644
--- a/app/src/main/res/layout/activity_repo_stargazers.xml
+++ b/app/src/main/res/layout/activity_repo_stargazers.xml
@@ -46,7 +46,6 @@
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
         android:columnWidth="80dp"
@@ -58,7 +57,6 @@
         android:id="@+id/noDataStargazers"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
@@ -73,4 +71,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_repo_watchers.xml b/app/src/main/res/layout/activity_repo_watchers.xml
index caa31458..6b40842a 100644
--- a/app/src/main/res/layout/activity_repo_watchers.xml
+++ b/app/src/main/res/layout/activity_repo_watchers.xml
@@ -46,7 +46,6 @@
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
         android:horizontalSpacing="10dp"
         android:numColumns="4"
         android:columnWidth="80dp"
@@ -58,7 +57,6 @@
         android:id="@+id/noDataWatchers"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
@@ -73,4 +71,4 @@
         android:indeterminate="true"
         android:visibility="visible" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/list_notifications.xml b/app/src/main/res/layout/list_notifications.xml
index ddc12ce2..bc957bdc 100644
--- a/app/src/main/res/layout/list_notifications.xml
+++ b/app/src/main/res/layout/list_notifications.xml
@@ -16,7 +16,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
@@ -69,7 +69,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:background="@android:color/transparent"
             android:contentDescription="@string/generalImgContentText"
             app:srcCompat="@drawable/ic_dotted_menu_horizontal" />
diff --git a/app/src/main/res/layout/list_repo_stargazers.xml b/app/src/main/res/layout/list_repo_stargazers.xml
index 4495a32e..79fc3a8c 100644
--- a/app/src/main/res/layout/list_repo_stargazers.xml
+++ b/app/src/main/res/layout/list_repo_stargazers.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
+    android:orientation="vertical"
+    tools:ignore="UseCompoundDrawables">
 
     <ImageView
         android:id="@+id/memberAvatar"
diff --git a/app/src/main/res/layout/list_repo_watchers.xml b/app/src/main/res/layout/list_repo_watchers.xml
index 9ae81f35..a6226bdf 100644
--- a/app/src/main/res/layout/list_repo_watchers.xml
+++ b/app/src/main/res/layout/list_repo_watchers.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
+    android:orientation="vertical"
+    tools:ignore="UseCompoundDrawables">
 
     <ImageView
         android:id="@+id/memberAvatar"