diff --git a/app/src/main/java/com/example/android/audacity/DashboardActivity.java b/app/src/main/java/com/example/android/audacity/DashboardActivity.java
index d177ada..b3baa4a 100644
--- a/app/src/main/java/com/example/android/audacity/DashboardActivity.java
+++ b/app/src/main/java/com/example/android/audacity/DashboardActivity.java
@@ -38,9 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mFirebaseAuth = FirebaseAuth.getInstance();
         if (mFirebaseAuth == null) {
-            startActivity(new Intent(this, LoginActivity.class));
-            finish();
-
+            navigateToLogin();
         }
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -141,9 +139,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.nav_sign_out:
                 if (mFirebaseAuth != null) {
                     mFirebaseAuth.signOut();
-                    Intent intent1 = new Intent(DashboardActivity.this, LoginActivity.class);
-                    startActivity(intent1);
-                    finish();
+                    navigateToLogin();
                 }
                 break;
             default:
@@ -151,4 +147,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    private void navigateToLogin() {
+        Intent intent = new Intent(DashboardActivity.this, LoginActivity.class);
+        startActivity(intent);
+        finish();
+    }
 }
diff --git a/app/src/main/java/com/example/android/audacity/LoginActivity.java b/app/src/main/java/com/example/android/audacity/LoginActivity.java
index ae8c768..3f1d349 100644
--- a/app/src/main/java/com/example/android/audacity/LoginActivity.java
+++ b/app/src/main/java/com/example/android/audacity/LoginActivity.java
@@ -6,20 +6,14 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
 import android.widget.Toast;
 
-import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
-import com.google.android.gms.auth.api.signin.GoogleSignInResult;
-import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.SignInButton;
 import com.google.android.gms.common.api.ApiException;
-import com.google.android.gms.common.api.GoogleApi;
-import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthCredential;
@@ -32,7 +26,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
 
     private static final String TAG = LoginActivity.class.getSimpleName();
     private FirebaseAuth mFirebaseAuth;
-    private SignInButton googleSignInButton;
+    private SignInButton mGoogleSignInButton;
     private GoogleSignInClient mGoogleSignInClient;
     private static final int RC_SIGN_IN = 1012;
 
@@ -54,8 +48,9 @@ protected void onCreate(Bundle savedInstanceState) {
             showDashboard();
         }
 
-        googleSignInButton = findViewById(R.id.google_sign_in_button);
-        googleSignInButton.setOnClickListener(this);
+        mGoogleSignInButton = findViewById(R.id.google_sign_in_button);
+        mGoogleSignInButton.setOnClickListener(this);
+        mGoogleSignInButton.setSize(SignInButton.SIZE_WIDE);
     }
 
     @Override
@@ -119,7 +114,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
     private void showDashboard() {
         Intent intent = new Intent(LoginActivity.this, DashboardActivity.class);
         startActivity(intent);
-
+        finish();
     }