diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
index 3946a47..7e00c67 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
@@ -122,7 +122,8 @@ public class SettingsFragment extends Fragment implements View.OnClickListener,
 
         break;
       case R.id.btn_save:
-        user.updateUser(parent);
+        if(txt_password.getText().length() > 3 && txt_email.getText().length() > 0) user.updateUser(parent);
+        else Toast.makeText(parent, "Password should be more than 4 chars long, valid email", Toast.LENGTH_LONG).show();
         break;
     }
   }
diff --git a/app/src/main/res/layout/note_view_full.xml b/app/src/main/res/layout/note_view_full.xml
index f2d9954..c160659 100644
--- a/app/src/main/res/layout/note_view_full.xml
+++ b/app/src/main/res/layout/note_view_full.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content">
 
         <ImageView
-            android:layout_width="wrap_content"
+            android:layout_width="20dp"
             android:layout_height="wrap_content"
             android:id="@+id/imageView10"
             android:src="@drawable/new_note"
@@ -49,7 +49,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/scrollView"
-                android:layout_weight="0.5"
+                android:layout_weight="0.55"
             android:layout_marginTop="7dp">
 
                 <EditText
@@ -71,7 +71,7 @@
                     android:id="@+id/nvf_note_permission"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="25dp"
+                    android:layout_marginTop="0dp"
                     android:checked="true"
                     android:text="@string/nvf_public_label"
                     android:layout_gravity="center_horizontal" />
@@ -87,7 +87,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/note_me"
-                        android:layout_margin="15dp"
+                        android:layout_margin="5dp"
                         android:drawableLeft="@android:drawable/ic_menu_send"
                         android:background="@color/colorPrimary"
                         android:textColor="#ffffff"
@@ -99,8 +99,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/throw_me"
-                        android:layout_marginTop="15dp"
-                        android:drawableLeft="@android:drawable/ic_menu_delete" />
+                      android:drawableLeft="@android:drawable/ic_menu_delete"
+                      android:layout_margin="5dp" />
 
                 </LinearLayout>
         </LinearLayout>
@@ -108,4 +108,4 @@
     </LinearLayout>
 
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>