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 9a494ae..e91ea7f 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
@@ -147,7 +147,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
 //                Log.d(TAG, "" + v.getId());
                 if (dateFilterIsVisible) {
                     dateFilterIsVisible = false;
-                    mapFilters.setVisibility(View.INVISIBLE);
+                    mapFilters.setVisibility(View.GONE);
                 } else {
                     mapFilters.setVisibility(View.VISIBLE);
                     dateFilterIsVisible = true;
@@ -167,7 +167,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
             public void onClick(View v) {
                 if (locationFilterIsVisible) {
                     locationFilterIsVisible = false;
-                    mapFilters.setVisibility(View.INVISIBLE);
+                    mapFilters.setVisibility(View.GONE);
                 } else {
                     mapFilters.setVisibility(View.VISIBLE);
                     locationFilterIsVisible = true;
@@ -187,7 +187,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
             public void onClick(View v) {
                 if (userFilterIsVisible) {
                     userFilterIsVisible = false;
-                    mapFilters.setVisibility(View.INVISIBLE);
+                    mapFilters.setVisibility(View.GONE);
                 } else {
                     mapFilters.setVisibility(View.VISIBLE);
                     userFilterIsVisible = true;
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
index 81573b1..cae9a6e 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
@@ -132,7 +132,7 @@ public class PersonalFragment extends Fragment {
             public void onClick(View v) {
                 if (dateFilterIsVisible) {
                     dateFilterIsVisible = false;
-                    personalSpaceFilters.setVisibility(View.INVISIBLE);
+                    personalSpaceFilters.setVisibility(View.GONE);
                 } else {
                     personalSpaceFilters.setVisibility(View.VISIBLE);
                     dateFilterIsVisible = true;
@@ -151,7 +151,7 @@ public class PersonalFragment extends Fragment {
             public void onClick(View v) {
                 if (userFilterIsVisible) {
                     userFilterIsVisible = false;
-                    personalSpaceFilters.setVisibility(View.INVISIBLE);
+                    personalSpaceFilters.setVisibility(View.GONE);
                 } else {
                     personalSpaceFilters.setVisibility(View.VISIBLE);
                     userFilterIsVisible = true;
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index 8f0328e..51dda74 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -34,7 +34,8 @@
                     android:id="@+id/personalSpace_date_filter"
                     android:layout_weight="1"
                     android:src="@drawable/date_icon"
-                    android:scaleType="fitCenter" />
+                    android:scaleType="fitCenter"
+                    android:focusable="false" />
 
                 <ImageButton
                     android:layout_width="50dp"
@@ -42,7 +43,9 @@
                     android:id="@+id/personalSpace_premission_filter"
                     android:layout_weight="1"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/permission_icon" />
+                    android:src="@drawable/permission_icon"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false" />
             </LinearLayout>
 
             <LinearLayout
@@ -51,8 +54,10 @@
                 android:layout_height="wrap_content"
                 android:contextClickable="false"
                 android:layout_marginTop="5dp"
-                android:visibility="invisible"
-                android:id="@+id/personalSpace_filter_options" >
+                android:visibility="gone"
+                android:id="@+id/personalSpace_filter_options"
+                android:clickable="false"
+                android:focusableInTouchMode="false">
 
                 <Button
                     android:layout_width="50dp"