diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 760ea46..7ac24c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3963879..b0c7b20 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,26 +5,31 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="7">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="6">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/Screenshots/Add Password.png b/Screenshots/Add Password.png
new file mode 100644
index 0000000..4373ede
Binary files /dev/null and b/Screenshots/Add Password.png differ
diff --git a/Screenshots/Added List.png b/Screenshots/Added List.png
new file mode 100644
index 0000000..b48f105
Binary files /dev/null and b/Screenshots/Added List.png differ
diff --git a/Screenshots/Screenshot_2017-12-01-10-03-58-873_com.nitsilchar.hp.passwordStorage[1].png b/Screenshots/Screenshot_2017-12-01-10-03-58-873_com.nitsilchar.hp.passwordStorage[1].png
new file mode 100644
index 0000000..16324a6
Binary files /dev/null and b/Screenshots/Screenshot_2017-12-01-10-03-58-873_com.nitsilchar.hp.passwordStorage[1].png differ
diff --git a/Screenshot_2017-12-01-10-04-34-089_com.nitsilchar.hp.passwordStorage[1].png b/Screenshots/Screenshot_2017-12-01-10-04-34-089_com.nitsilchar.hp.passwordStorage[1].png
similarity index 100%
rename from Screenshot_2017-12-01-10-04-34-089_com.nitsilchar.hp.passwordStorage[1].png
rename to Screenshots/Screenshot_2017-12-01-10-04-34-089_com.nitsilchar.hp.passwordStorage[1].png
diff --git a/Screenshots/Stored List.png b/Screenshots/Stored List.png
new file mode 100644
index 0000000..41f5c8c
Binary files /dev/null and b/Screenshots/Stored List.png differ
diff --git a/Screenshots/View Password.png b/Screenshots/View Password.png
new file mode 100644
index 0000000..9a8df5a
Binary files /dev/null and b/Screenshots/View Password.png differ
diff --git a/Screenshots/email.png b/Screenshots/email.png
new file mode 100644
index 0000000..8d0190f
Binary files /dev/null and b/Screenshots/email.png differ
diff --git a/Screenshots/icon.png b/Screenshots/icon.png
new file mode 100644
index 0000000..652f813
Binary files /dev/null and b/Screenshots/icon.png differ
diff --git a/Screenshots/password.png b/Screenshots/password.png
new file mode 100644
index 0000000..5bcb30a
Binary files /dev/null and b/Screenshots/password.png differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a3f5b1..951f5c9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.nitsilchar.hp.passwordStorage">
 
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
         android:allowBackup="true"
@@ -12,33 +12,38 @@
         android:roundIcon="@mipmap/icon"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.nitsilchar.hp.passwordStorage.activity.MainActivity"
-            android:label="@string/manifest_label_main"></activity>
-        <activity android:name="com.nitsilchar.hp.passwordStorage.activity.DetailsActivity"
+        <activity
+            android:name=".activity.MainActivity"
+            android:label="@string/manifest_label_main" />
+        <activity
+            android:name=".activity.DetailsActivity"
             android:label="Information">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.nitsilchar.hp.passwordStorage.activity.MainActivity"/>
+                android:value="com.nitsilchar.hp.passwordStorage.activity.MainActivity" />
         </activity>
-        <activity android:name="com.nitsilchar.hp.passwordStorage.activity.LoginRegistrationActivity"></activity>
-        <activity android:name="com.nitsilchar.hp.passwordStorage.activity.LoginActivity"
+        <activity android:name=".activity.LoginRegistrationActivity" />
+        <activity
+            android:name=".activity.LoginActivity"
             android:label="@string/manifest_label_login"
-            android:theme="@style/AppThemeNoBar"/>
-        <activity android:name="com.nitsilchar.hp.passwordStorage.activity.RegistrationActivity"
+            android:theme="@style/AppThemeNoBar" />
+        <activity
+            android:name=".activity.RegistrationActivity"
             android:label="@string/manifest_label_register"
-            android:theme="@style/AppThemeNoBar"/>
-        <activity android:name="com.nitsilchar.hp.passwordStorage.activity.SplashActivity">
+            android:theme="@style/AppThemeNoBar" />
+        <activity android:name=".activity.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
+        <activity android:name=".activity.ResetPasswordActivity"></activity>
         <meta-data
             android:name="io.fabric.ApiKey"
-            android:value="17f1fea763a098c9beeff1537f9e9c9b96034009"
-            />
+            android:value="17f1fea763a098c9beeff1537f9e9c9b96034009" />
+
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/LoginActivity.java b/app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/LoginActivity.java
index a0c2cff..f5cab4b 100644
--- a/app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/LoginActivity.java
+++ b/app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/LoginActivity.java
@@ -10,6 +10,7 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.crashlytics.android.Crashlytics;
@@ -31,8 +32,10 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
     String str_Password, str_getEmail, str_getPass;
     EditText edt_Email, edt_Password;
     Button login,register, newuser;
+    TextView t1;
     CardView cardView1,cardView2;
     boolean b=false;
+
     Properties prop;
     private FirebaseAuth auth;
     private ProgressBar progressBar;
@@ -55,7 +58,14 @@ protected void onCreate(Bundle savedInstanceState) {
         edt_Password = (EditText) findViewById(R.id.edt_password);
         cardView1=(CardView)findViewById(R.id.card1);
         cardView2=(CardView)findViewById(R.id.card2);
+        t1=(TextView)findViewById(R.id.resetpw);
         progressBar=(ProgressBar)findViewById(R.id.progressBar);
+        t1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(LoginActivity.this,ResetPasswordActivity.class));
+            }
+        });
         b=splashActivity.containsPass("password");
         if(b==true){
         }
diff --git a/app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/ResetPasswordActivity.java b/app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/ResetPasswordActivity.java
new file mode 100644
index 0000000..8e90712
--- /dev/null
+++ b/app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/ResetPasswordActivity.java
@@ -0,0 +1,96 @@
+package com.nitsilchar.hp.passwordStorage.activity;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.FirebaseAuth;
+import com.nitsilchar.hp.passwordStorage.R;
+
+public class ResetPasswordActivity extends AppCompatActivity implements View.OnClickListener {
+
+    public EditText input_email;
+    public String et1;
+    public Button btnResetPass;
+    private TextView btnBack;
+    private RelativeLayout activity_forgot;
+
+    private FirebaseAuth auth;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_reset_password);
+
+        //View
+        input_email = (EditText)findViewById(R.id.forgot_email);
+        btnResetPass = (Button)findViewById(R.id.forgot_btn_reset);
+        btnBack = (TextView)findViewById(R.id.forgot_btn_back);
+        activity_forgot = (RelativeLayout)findViewById(R.id.activity_forgot_password);
+
+        btnResetPass.setOnClickListener(this);
+        btnBack.setOnClickListener(this);
+
+        //Init Firebase
+        auth = FirebaseAuth.getInstance();
+
+    }
+
+    @Override
+    public void onClick(View view) {
+
+        et1=input_email.getText().toString();
+
+        if(view.getId() == R.id.forgot_btn_back)
+        {
+
+
+
+            startActivity(new Intent(this,LoginActivity.class));
+            finish();
+        }
+        else
+            if(view.getId() == R.id.forgot_btn_reset)
+        {
+
+
+                resetPassword(input_email.getText().toString());
+
+        }
+    }
+
+    private void resetPassword(final String email) {
+        auth.sendPasswordResetEmail(email)
+                .addOnCompleteListener(this, new OnCompleteListener<Void>() {
+                    @Override
+                    public void onComplete(@NonNull Task<Void> task) {
+
+
+
+                        if(task.isSuccessful())
+                        {
+                            Toast.makeText(getApplicationContext(),
+                                    "We have sent password to email: "+email, Toast.LENGTH_LONG).show();
+                            Snackbar snackBar = Snackbar.make(activity_forgot,"We have sent password to email: "+email,Snackbar.LENGTH_SHORT);
+                            snackBar.show();
+                        }
+                        else{
+                            Toast.makeText(getApplicationContext(),
+                                    "failed!!!", Toast.LENGTH_LONG).show();
+                            Snackbar snackBar = Snackbar.make(activity_forgot,"Failed to send password",Snackbar.LENGTH_SHORT);
+                            snackBar.show();
+                        }
+                    }
+                });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml
new file mode 100644
index 0000000..6f5161b
--- /dev/null
+++ b/app/src/main/res/drawable/border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <stroke
+        android:width="2dp"
+        android:color="#cdcdcd" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button2.xml b/app/src/main/res/drawable/button2.xml
new file mode 100644
index 0000000..30f385d
--- /dev/null
+++ b/app/src/main/res/drawable/button2.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <corners
+        android:radius="14dp"
+        />
+    <solid
+        android:color="#5DB060"
+        />
+    <padding
+        android:left="0dp"
+        android:top="0dp"
+        android:right="0dp"
+        android:bottom="0dp"
+        />
+    <size
+        android:width="270dp"
+        android:height="60dp"
+        />
+    <stroke
+        android:width="3dp"
+        android:color="#5DB060"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
new file mode 100644
index 0000000..2b2d92a
--- /dev/null
+++ b/app/src/main/res/drawable/button_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <corners
+        android:radius="14dp"
+        />
+    <solid
+        android:color="#6FD172"
+        />
+    <padding
+        android:left="0dp"
+        android:top="0dp"
+        android:right="0dp"
+        android:bottom="0dp"
+        />
+    <size
+        android:width="270dp"
+        android:height="60dp"
+        />
+    <stroke
+        android:width="0dp"
+        android:color="#6FD172"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/edittext.xml b/app/src/main/res/drawable/edittext.xml
index c6f4108..edc681a 100644
--- a/app/src/main/res/drawable/edittext.xml
+++ b/app/src/main/res/drawable/edittext.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <corners
+        android:radius="14dp"
+        />
     <solid
-        android:color="#4D000000" />
-
+        android:color="#4D000000"
+        />
+    <padding
+        android:left="0dp"
+        android:top="0dp"
+        android:right="0dp"
+        android:bottom="0dp"
+        />
+    <size
+        android:width="270dp"
+        android:height="60dp"
+        />
+    <stroke
+        android:width="3dp"
+        android:color="#4D000000"
+        />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw320dp/activity_login.xml b/app/src/main/res/layout-sw320dp/activity_login.xml
index c6da647..81847c2 100644
--- a/app/src/main/res/layout-sw320dp/activity_login.xml
+++ b/app/src/main/res/layout-sw320dp/activity_login.xml
@@ -19,6 +19,9 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="15dp"
+
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -27,6 +30,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:layout_marginTop="80dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -75,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton">
+                android:background="@drawable/button_background">
 
                 <Button
                     android:id="@+id/btn_login"
@@ -94,12 +98,24 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
+                android:layout_marginTop="10dp"
                 android:gravity="center"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:text="@string/newuser"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/space"
                 android:textStyle="bold" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/resetpw"
+                android:layout_marginTop="@dimen/header_text_marginTop"
+                android:fontFamily="sans-serif-smallcaps"
+                android:gravity="center"
+                android:text="@string/res"
+                android:textColor="@android:color/white"
+                android:textStyle="bold" />
+
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw320dp/activity_login_registration.xml b/app/src/main/res/layout-sw320dp/activity_login_registration.xml
index 96bb5d8..77f4fb2 100644
--- a/app/src/main/res/layout-sw320dp/activity_login_registration.xml
+++ b/app/src/main/res/layout-sw320dp/activity_login_registration.xml
@@ -8,20 +8,32 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/header_text_marginTop"
+        android:layout_marginTop="100dp"
         android:fontFamily="sans-serif-smallcaps"
         android:gravity="center"
         android:text="@string/app_name"
         android:textColor="@android:color/white"
         android:textSize="@dimen/header_text"
         android:textStyle="bold" />
+<LinearLayout
+    android:layout_marginTop="50dp"
+    android:background="@drawable/border"
+    android:layout_width="match_parent"
+
+    android:layout_marginLeft="30dp"
+    android:layout_marginRight="30dp"
+    android:layout_marginBottom="150dp"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:layout_height="match_parent">
 
 
     <android.support.v7.widget.CardView
         android:id="@+id/layout1"
         android:layout_width="200dp"
+        android:background="@drawable/button_background"
         android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
+
         android:layout_centerHorizontal="true"
         android:layout_marginTop="130dp">
 
@@ -32,7 +44,7 @@
             android:textStyle="bold"
             android:textSize="16sp"
             android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
+            android:background="@drawable/button_background"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </android.support.v7.widget.CardView>
@@ -40,8 +52,8 @@
         android:id="@+id/layout2"
         android:layout_below="@+id/layout1"
         android:layout_width="200dp"
+        android:background="@drawable/button2"
         android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="50dp">
 
@@ -52,10 +64,14 @@
             android:textStyle="bold"
             android:textSize="16sp"
             android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
+            android:background="@drawable/button2"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </android.support.v7.widget.CardView>
+
+
+</LinearLayout>
+
 </RelativeLayout>
 
 
diff --git a/app/src/main/res/layout-sw320dp/activity_registration.xml b/app/src/main/res/layout-sw320dp/activity_registration.xml
index 8fc3ea3..e19338f 100644
--- a/app/src/main/res/layout-sw320dp/activity_registration.xml
+++ b/app/src/main/res/layout-sw320dp/activity_registration.xml
@@ -18,6 +18,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="15dp"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -92,14 +94,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton"
+
                 android:orientation="vertical">
 
                 <Button
                     android:id="@+id/btn_register"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_register"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -108,10 +110,11 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/existinguser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
                 android:text="@string/existinguser"
diff --git a/app/src/main/res/layout-sw480dp/activity_login.xml b/app/src/main/res/layout-sw480dp/activity_login.xml
index c6da647..d3ff96c 100644
--- a/app/src/main/res/layout-sw480dp/activity_login.xml
+++ b/app/src/main/res/layout-sw480dp/activity_login.xml
@@ -19,6 +19,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="15dp"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -27,6 +29,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:layout_marginTop="80dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -62,6 +65,8 @@
                 android:textColor="@color/white"
                 android:textColorHint="@color/white" />
 
+
+
         </LinearLayout>
 
         <LinearLayout
@@ -75,13 +80,13 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton">
+               >
 
                 <Button
                     android:id="@+id/btn_login"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_login"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -90,18 +95,29 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/newuser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:text="@string/newuser"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/space"
                 android:textStyle="bold" />
 
         </LinearLayout>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/header_text_marginTop"
+            android:fontFamily="sans-serif-smallcaps"
+            android:gravity="center"
+            android:text="@string/res"
+            android:id="@+id/resetpw"
+            android:textColor="@android:color/white"
+            android:textStyle="bold" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw480dp/activity_login_registration.xml b/app/src/main/res/layout-sw480dp/activity_login_registration.xml
index 96bb5d8..4a49ee4 100644
--- a/app/src/main/res/layout-sw480dp/activity_login_registration.xml
+++ b/app/src/main/res/layout-sw480dp/activity_login_registration.xml
@@ -8,54 +8,70 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/header_text_marginTop"
+        android:layout_marginTop="100dp"
         android:fontFamily="sans-serif-smallcaps"
         android:gravity="center"
         android:text="@string/app_name"
         android:textColor="@android:color/white"
         android:textSize="@dimen/header_text"
         android:textStyle="bold" />
+    <LinearLayout
+        android:layout_marginTop="80dp"
+        android:background="@drawable/border"
+        android:layout_width="match_parent"
 
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="150dp"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:layout_height="match_parent">
+
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button_background"
+            android:layout_height="wrap_content"
+
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="130dp">
+
+            <Button
+                android:id="@+id/btn_login"
+                android:padding="15dp"
+                android:text="@string/login_regstr_blogin"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button_background"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout2"
+            android:layout_below="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button2"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="50dp">
+
+            <Button
+                android:id="@+id/btn_register"
+                android:padding="15dp"
+                android:text="@string/login_regstr_bregstr"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+
+
+    </LinearLayout>
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="130dp">
-
-        <Button
-            android:id="@+id/btn_login"
-            android:padding="15dp"
-            android:text="@string/login_regstr_blogin"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout2"
-        android:layout_below="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="50dp">
-
-        <Button
-            android:id="@+id/btn_register"
-            android:padding="15dp"
-            android:text="@string/login_regstr_bregstr"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
 </RelativeLayout>
 
 
diff --git a/app/src/main/res/layout-sw480dp/activity_registration.xml b/app/src/main/res/layout-sw480dp/activity_registration.xml
index 8fc3ea3..e19338f 100644
--- a/app/src/main/res/layout-sw480dp/activity_registration.xml
+++ b/app/src/main/res/layout-sw480dp/activity_registration.xml
@@ -18,6 +18,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="15dp"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -92,14 +94,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton"
+
                 android:orientation="vertical">
 
                 <Button
                     android:id="@+id/btn_register"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_register"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -108,10 +110,11 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/existinguser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
                 android:text="@string/existinguser"
diff --git a/app/src/main/res/layout-sw600dp/activity_login.xml b/app/src/main/res/layout-sw600dp/activity_login.xml
index c6da647..660ed47 100644
--- a/app/src/main/res/layout-sw600dp/activity_login.xml
+++ b/app/src/main/res/layout-sw600dp/activity_login.xml
@@ -19,6 +19,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:padding="15dp"
+        android:background="@drawable/border"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -27,6 +29,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:layout_marginTop="80dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -75,13 +78,14 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton">
+            >
 
                 <Button
+
                     android:id="@+id/btn_login"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_login"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -90,16 +94,27 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/newuser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:text="@string/newuser"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/space"
                 android:textStyle="bold" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/header_text_marginTop"
+                android:fontFamily="sans-serif-smallcaps"
+                android:gravity="center"
+                android:text="@string/res"
+                android:id="@+id/resetpw"
+                android:textColor="@android:color/white"
+                android:textStyle="bold" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw600dp/activity_login_registration.xml b/app/src/main/res/layout-sw600dp/activity_login_registration.xml
index 96bb5d8..a809988 100644
--- a/app/src/main/res/layout-sw600dp/activity_login_registration.xml
+++ b/app/src/main/res/layout-sw600dp/activity_login_registration.xml
@@ -8,54 +8,70 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/header_text_marginTop"
+        android:layout_marginTop="150dp"
         android:fontFamily="sans-serif-smallcaps"
         android:gravity="center"
         android:text="@string/app_name"
         android:textColor="@android:color/white"
         android:textSize="@dimen/header_text"
         android:textStyle="bold" />
+    <LinearLayout
+        android:layout_marginTop="100dp"
+        android:background="@drawable/border"
+        android:layout_width="match_parent"
 
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="200dp"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:layout_height="match_parent">
+
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button_background"
+            android:layout_height="wrap_content"
+
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="130dp">
+
+            <Button
+                android:id="@+id/btn_login"
+                android:padding="15dp"
+                android:text="@string/login_regstr_blogin"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button_background"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout2"
+            android:layout_below="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button2"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="50dp">
+
+            <Button
+                android:id="@+id/btn_register"
+                android:padding="15dp"
+                android:text="@string/login_regstr_bregstr"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+
+
+    </LinearLayout>
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="130dp">
-
-        <Button
-            android:id="@+id/btn_login"
-            android:padding="15dp"
-            android:text="@string/login_regstr_blogin"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout2"
-        android:layout_below="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="50dp">
-
-        <Button
-            android:id="@+id/btn_register"
-            android:padding="15dp"
-            android:text="@string/login_regstr_bregstr"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
 </RelativeLayout>
 
 
diff --git a/app/src/main/res/layout-sw600dp/activity_registration.xml b/app/src/main/res/layout-sw600dp/activity_registration.xml
index 8fc3ea3..e19338f 100644
--- a/app/src/main/res/layout-sw600dp/activity_registration.xml
+++ b/app/src/main/res/layout-sw600dp/activity_registration.xml
@@ -18,6 +18,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="15dp"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -92,14 +94,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton"
+
                 android:orientation="vertical">
 
                 <Button
                     android:id="@+id/btn_register"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_register"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -108,10 +110,11 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/existinguser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
                 android:text="@string/existinguser"
diff --git a/app/src/main/res/layout-sw720dp/activity_login.xml b/app/src/main/res/layout-sw720dp/activity_login.xml
index c6da647..2808c39 100644
--- a/app/src/main/res/layout-sw720dp/activity_login.xml
+++ b/app/src/main/res/layout-sw720dp/activity_login.xml
@@ -19,6 +19,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="15dp"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -27,6 +29,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:layout_marginTop="80dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -75,13 +78,14 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton">
+                >
 
                 <Button
+
                     android:id="@+id/btn_login"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_login"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -90,16 +94,28 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/newuser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:text="@string/newuser"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/space"
                 android:textStyle="bold" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/header_text_marginTop"
+                android:fontFamily="sans-serif-smallcaps"
+                android:gravity="center"
+                android:id="@+id/resetpw"
+                android:text="@string/res"
+                android:textColor="@android:color/white"
+                android:textStyle="bold" />
+
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw720dp/activity_login_registration.xml b/app/src/main/res/layout-sw720dp/activity_login_registration.xml
index 96bb5d8..207ae4c 100644
--- a/app/src/main/res/layout-sw720dp/activity_login_registration.xml
+++ b/app/src/main/res/layout-sw720dp/activity_login_registration.xml
@@ -8,54 +8,70 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/header_text_marginTop"
+        android:layout_marginTop="100dp"
         android:fontFamily="sans-serif-smallcaps"
         android:gravity="center"
         android:text="@string/app_name"
         android:textColor="@android:color/white"
         android:textSize="@dimen/header_text"
         android:textStyle="bold" />
+    <LinearLayout
+        android:layout_marginTop="50dp"
+        android:background="@drawable/border"
+        android:layout_width="match_parent"
 
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="150dp"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:layout_height="match_parent">
+
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button_background"
+            android:layout_height="wrap_content"
+
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="130dp">
+
+            <Button
+                android:id="@+id/btn_login"
+                android:padding="15dp"
+                android:text="@string/login_regstr_blogin"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button_background"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout2"
+            android:layout_below="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button2"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="50dp">
+
+            <Button
+                android:id="@+id/btn_register"
+                android:padding="15dp"
+                android:text="@string/login_regstr_bregstr"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+
+
+    </LinearLayout>
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="130dp">
-
-        <Button
-            android:id="@+id/btn_login"
-            android:padding="15dp"
-            android:text="@string/login_regstr_blogin"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout2"
-        android:layout_below="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="50dp">
-
-        <Button
-            android:id="@+id/btn_register"
-            android:padding="15dp"
-            android:text="@string/login_regstr_bregstr"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
 </RelativeLayout>
 
 
diff --git a/app/src/main/res/layout-sw720dp/activity_registration.xml b/app/src/main/res/layout-sw720dp/activity_registration.xml
index 8fc3ea3..e512486 100644
--- a/app/src/main/res/layout-sw720dp/activity_registration.xml
+++ b/app/src/main/res/layout-sw720dp/activity_registration.xml
@@ -9,7 +9,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/header_text_marginTop"
+        android:layout_marginTop="100sp"
         android:fontFamily="sans-serif-smallcaps"
         android:gravity="center"
         android:text="@string/app_name"
@@ -18,6 +18,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="50dp"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -92,14 +94,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton"
+
                 android:orientation="vertical">
 
                 <Button
                     android:id="@+id/btn_register"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_register"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -108,10 +110,11 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/existinguser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
                 android:text="@string/existinguser"
diff --git a/app/src/main/res/layout-sw720dp/activity_reset_password.xml b/app/src/main/res/layout-sw720dp/activity_reset_password.xml
new file mode 100644
index 0000000..e60dca5
--- /dev/null
+++ b/app/src/main/res/layout-sw720dp/activity_reset_password.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_forgot_password"
+    android:layout_width="match_parent"
+    android:layout_marginTop="150dp"
+    android:layout_gravity="center_horizontal"
+    android:layout_height="match_parent"
+    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=".activity.ResetPasswordActivity">
+
+
+
+    <TextView
+
+        android:id="@+id/forgot_message"
+        android:layout_centerHorizontal="true"
+        android:text="Enter your mail-id and go to your inbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/Widget.AppCompat.Button.Borderless"
+        android:textColor="@color/colorPrimaryDark"
+        />
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_below="@+id/forgot_message"
+        android:id="@+id/forgot_input_email"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <EditText
+            android:id="@+id/forgot_email"
+            android:hint="Enter your email"
+            android:inputType="textCapWords"
+            android:maxLines="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </android.support.design.widget.TextInputLayout>
+
+
+
+    <Button
+        android:layout_below="@+id/forgot_input_email"
+        android:id="@+id/forgot_btn_reset"
+        android:text="Reset Password"
+        android:background="#263238"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+<Button
+    android:layout_width="match_parent"
+    android:paddingTop="10dp"
+    android:layout_marginTop="10dp"
+    android:text="BACK"
+    android:id="@+id/forgot_btn_back"
+    android:layout_height="wrap_content"
+    android:layout_below="@id/forgot_btn_reset"
+    android:gravity="center"
+    />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index c6da647..0a3556a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -19,6 +19,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:padding="15dp"
+        android:background="@drawable/border"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -27,6 +29,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:layout_marginTop="80dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -62,6 +65,7 @@
                 android:textColor="@color/white"
                 android:textColorHint="@color/white" />
 
+
         </LinearLayout>
 
         <LinearLayout
@@ -75,13 +79,13 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton">
+              >
 
                 <Button
                     android:id="@+id/btn_login"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_login"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -90,15 +94,27 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/newuser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:text="@string/newuser"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/space"
+
+                android:textStyle="bold" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/header_text_marginTop"
+                android:fontFamily="sans-serif-smallcaps"
+                android:gravity="center"
+                android:text="@string/res"
+                android:id="@+id/resetpw"
+                android:textColor="@android:color/white"
                 android:textStyle="bold" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_login_registration.xml b/app/src/main/res/layout/activity_login_registration.xml
index 96bb5d8..726c8c7 100644
--- a/app/src/main/res/layout/activity_login_registration.xml
+++ b/app/src/main/res/layout/activity_login_registration.xml
@@ -8,54 +8,70 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/header_text_marginTop"
+        android:layout_marginTop="100dp"
         android:fontFamily="sans-serif-smallcaps"
         android:gravity="center"
         android:text="@string/app_name"
         android:textColor="@android:color/white"
         android:textSize="@dimen/header_text"
         android:textStyle="bold" />
+    <LinearLayout
+        android:layout_marginTop="50dp"
+        android:background="@drawable/border"
+        android:layout_width="match_parent"
 
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="100dp"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:layout_height="match_parent">
+
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button_background"
+            android:layout_height="wrap_content"
+
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="130dp">
+
+            <Button
+                android:id="@+id/btn_login"
+                android:padding="15dp"
+                android:text="@string/login_regstr_blogin"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button_background"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+        <android.support.v7.widget.CardView
+            android:id="@+id/layout2"
+            android:layout_below="@+id/layout1"
+            android:layout_width="200dp"
+            android:background="@drawable/button2"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="50dp">
+
+            <Button
+                android:id="@+id/btn_register"
+                android:padding="15dp"
+                android:text="@string/login_regstr_bregstr"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:background="@drawable/button2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+
+
+    </LinearLayout>
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="130dp">
-
-        <Button
-            android:id="@+id/btn_login"
-            android:padding="15dp"
-            android:text="@string/login_regstr_blogin"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:id="@+id/layout2"
-        android:layout_below="@+id/layout1"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="50dp">
-
-        <Button
-            android:id="@+id/btn_register"
-            android:padding="15dp"
-            android:text="@string/login_regstr_bregstr"
-            android:textStyle="bold"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/greenbutton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
 </RelativeLayout>
 
 
diff --git a/app/src/main/res/layout/activity_registration.xml b/app/src/main/res/layout/activity_registration.xml
index 8fc3ea3..e19338f 100644
--- a/app/src/main/res/layout/activity_registration.xml
+++ b/app/src/main/res/layout/activity_registration.xml
@@ -18,6 +18,8 @@
         android:textStyle="bold" />
 
     <LinearLayout
+        android:background="@drawable/border"
+        android:padding="15dp"
         android:id="@+id/layout1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -92,14 +94,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/space"
-                android:background="@drawable/greenbutton"
+
                 android:orientation="vertical">
 
                 <Button
                     android:id="@+id/btn_register"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
+                    android:background="@drawable/button_background"
                     android:text="@string/manifest_label_register"
                     android:textColor="@color/white"
                     android:textSize="@dimen/text"
@@ -108,10 +110,11 @@
             </LinearLayout>
 
             <Button
+                android:layout_marginTop="15dp"
                 android:id="@+id/existinguser"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
+                android:background="@drawable/button2"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
                 android:text="@string/existinguser"
diff --git a/app/src/main/res/layout/activity_reset_password.xml b/app/src/main/res/layout/activity_reset_password.xml
new file mode 100644
index 0000000..99bcb61
--- /dev/null
+++ b/app/src/main/res/layout/activity_reset_password.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_forgot_password"
+    android:layout_width="match_parent"
+    android:layout_marginTop="150dp"
+    android:layout_gravity="center_horizontal"
+    android:layout_height="match_parent"
+    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=".activity.ResetPasswordActivity">
+
+
+
+    <TextView
+
+        android:id="@+id/forgot_message"
+        android:layout_centerHorizontal="true"
+        android:text="Enter your mail-id and go to your inbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/Widget.AppCompat.Button.Borderless"
+        android:textColor="@color/colorPrimaryDark"
+        />
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_below="@+id/forgot_message"
+        android:id="@+id/forgot_input_email"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <EditText
+            android:id="@+id/forgot_email"
+            android:hint="Enter your email"
+            android:inputType="textCapWords"
+            android:maxLines="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </android.support.design.widget.TextInputLayout>
+
+
+
+    <Button
+        android:layout_below="@+id/forgot_input_email"
+        android:id="@+id/forgot_btn_reset"
+        android:text="Reset Password"
+        android:background="#263238"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:layout_width="match_parent"
+        android:paddingTop="10dp"
+        android:layout_marginTop="10dp"
+        android:text="BACK"
+        android:id="@+id/forgot_btn_back"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/forgot_btn_reset"
+        android:gravity="center"
+        />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0342b40..d8f9b0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="details_show_password">Show password</string>
     <string name="details_confirm">Confirm</string>
     <string name="details_wrong_password">Wrong Password</string>
-
+<string name="res">Reset Password</string>
     <string name="login_enter_mail_password">Please enter your login Email Id and Password</string>
     <string name="login_enter_emailid">Please enter your Email Id</string>
     <string name="login_enter_password">Please enter your Password</string>
diff --git a/build.gradle b/build.gradle
index e7d911d..dd15aae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     repositories {
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
@@ -18,6 +19,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }