diff --git a/.idea/libraries/com_google_android_gms_play_services_basement_11_8_0.xml b/.idea/libraries/com_google_android_gms_play_services_basement_11_8_0.xml
diff --git a/.idea/libraries/com_google_android_gms_play_services_basement_license_11_8_0.xml b/.idea/libraries/com_google_android_gms_play_services_basement_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_android_gms_play_services_tasks_11_8_0.xml b/.idea/libraries/com_google_android_gms_play_services_tasks_11_8_0.xml
diff --git a/.idea/libraries/com_google_android_gms_play_services_tasks_license_11_8_0.xml b/.idea/libraries/com_google_android_gms_play_services_tasks_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_analytics_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_analytics_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_analytics_impl_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_analytics_impl_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_analytics_impl_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_analytics_impl_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_analytics_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_analytics_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_auth_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_auth_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_auth_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_auth_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_common_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_common_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_common_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_common_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_core_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_core_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_database_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_database_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_database_connection_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_database_connection_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_database_connection_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_database_connection_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_database_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_database_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_iid_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_iid_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_iid_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_iid_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_storage_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_storage_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_storage_common_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_storage_common_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_storage_common_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_storage_common_license_11_8_0.xml
diff --git a/.idea/libraries/com_google_firebase_firebase_storage_license_11_8_0.xml b/.idea/libraries/com_google_firebase_firebase_storage_license_11_8_0.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/LiftAppBackup.iml b/LiftAppBackup.iml
diff --git a/app/app.iml b/app/app.iml
@@ -71,24 +71,25 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -99,12 +100,15 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />

diff --git a/app/src/main/java/com/example/admin/liftapp/Controller/UserDetailFragment.java b/app/src/main/java/com/example/admin/liftapp/Controller/UserDetailFragment.java
@@ -146,8 +146,8 @@ public void onClick(View v) {
 
 
              view.findViewById(R.id.newstudent_save_btn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+                @Override
+                public void onClick(View view) {
 
                 final String text= userName.getText().toString();
                 if (text.equals("")) {

diff --git a/app/src/main/java/com/example/admin/liftapp/MainActivity.java b/app/src/main/java/com/example/admin/liftapp/MainActivity.java
@@ -3,9 +3,11 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-
+import android.widget.Button;
+import android.view.View;
 import com.example.admin.liftapp.Controller.LoginFragment;
 import com.example.admin.liftapp.Controller.MyApplication;
 import com.example.admin.liftapp.Controller.TrainerListFragment;
@@ -16,12 +18,49 @@
 
 public class MainActivity extends AppCompatActivity implements TrainerListFragment.OnFragmentUserListInteractionListener,LoginFragment.OnFragmentLoginInteractionListener,UserDetailFragment.OnFragmentUserInteractionListener {
 
+
+    private Button buttonLogin;
+    private Button buttonSocial;
+    private Button buttonTrainer;
+    private Button buttonPlan;
+    private Button buttonUser;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         MyApplication application= new MyApplication();
-       // if (Authentication.isSignedIn() == false) {
+        buttonSocial = findViewById(R.id.List_Button_Nav);
+        buttonLogin = findViewById(R.id.Login_Button_Nav);
+        buttonPlan = findViewById(R.id.Routine_Button_Nav);
+        buttonUser = findViewById(R.id.User_Button_Nav);
+
+        buttonSocial.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+               showaTraineraListFragment();
+            }
+        });
+        buttonLogin.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                showLoginFragment();
+            }
+        });
+        buttonPlan.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //ON IDAN TODO();
+            }
+        });
+
+        buttonUser.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                showUserFragment();
+            }
+        });
+
+                // if (Authentication.isSignedIn() == false) {
             showLoginFragment();
         ///}
         //else {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container"
+<LinearLayout
+    android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/colorAccent"
+        >
+        <Button
+            android:id="@+id/Login_Button_Nav"
+            android:text="Login"
+            android:background="@color/colorPrimaryDark"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
+
+        <Button
+            android:id="@+id/List_Button_Nav"
+            android:text="Social"
+            android:background="@color/colorPrimaryDark"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
+
+        <Button
+            android:id="@+id/Routine_Button_Nav"
+            android:text="Plan"
+            android:layout_width="0dp"
+            android:background="@color/colorPrimaryDark"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
+
+        <Button
+            android:background="@color/colorPrimaryDark"
+            android:id="@+id/User_Button_Nav"
+            android:text="Me"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
+
+    </LinearLayout>
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
+
diff --git a/local.properties b/local.properties
@@ -1,10 +1,11 @@
 ## This file is automatically generated by Android Studio.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
 #
-# This file should *NOT* be checked into Version Control Systems,
+# This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/Users/admin/Library/Android/sdk
+#Fri Jun 01 16:53:58 IDT 2018
+sdk.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk