diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
index 7e6ea91..cfcbc2c 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
@@ -65,7 +65,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
     private Button map_small_filter;
     private Button map_medium_filter;
     private Button map_large_filter;
-    private LinearLayout mapFilters;
+    private LinearLayout mapFilters, mainMapFilters;
     private boolean dateFilterIsVisible = false;
     private boolean locationFilterIsVisible = false;
     private boolean userFilterIsVisible = false;
@@ -133,6 +133,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
         map_large_filter.setOnClickListener(button3ClickListener);
 
         mapFilters = (LinearLayout) view.findViewById(R.id.map_filter_options);
+        mainMapFilters = (LinearLayout) view.findViewById(R.id.map_filters_layout);
 
         dateFilter.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -533,6 +534,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
         } else {
             locationFilter.setBackgroundResource(android.R.drawable.btn_default);
         }
+        mainMapFilters.setPadding(0, 8, 0, 0);
     }
 
     public void updateShowedNotes() {
diff --git a/app/src/main/res/layout/fragment_explore.xml b/app/src/main/res/layout/fragment_explore.xml
index cb201a6..1652c24 100644
--- a/app/src/main/res/layout/fragment_explore.xml
+++ b/app/src/main/res/layout/fragment_explore.xml
@@ -4,7 +4,7 @@
   android:layout_height="match_parent"
   tools:context="com.android_app.matan.ara.sagi.thesocialnotework.ExploreFragment"
   android:orientation="vertical"
-  android:paddingTop="15dp">
+    android:paddingTop="3dp">
 
   <!-- TODO: Update blank fragment layout -->
 
@@ -16,8 +16,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="15dp" >
+        android:layout_height="wrap_content">
 
       <LinearLayout
           android:orientation="horizontal"
diff --git a/app/src/main/res/layout/fragment_gmap.xml b/app/src/main/res/layout/fragment_gmap.xml
index c96376c..ecdad48 100644
--- a/app/src/main/res/layout/fragment_gmap.xml
+++ b/app/src/main/res/layout/fragment_gmap.xml
@@ -18,7 +18,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="15dp">
+        android:id="@+id/map_filters_layout">
 
         <LinearLayout
             android:orientation="horizontal"
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index 4584405..1d53e22 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -10,12 +10,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
         tools:context="com.android_app.matan.ara.sagi.thesocialnotework.PersonalSpaceActivity"
-      android:layout_marginBottom="5dp">
+      android:layout_marginBottom="5dp"
+        android:padding="3dp">
 
         <LinearLayout
             android:orientation="vertical"