diff --git a/app/src/androidTest/java/id/ac/ui/cs/myui/PanicButtonTestSuite.java b/app/src/androidTest/java/id/ac/ui/cs/myui/PanicButtonTestSuite.java
index 8ac57bce1823caec7016a228bfb3bfb2e9bdfa9a..354a02b3136d3a208a79418a140b6d1b5e15da95 100644
--- a/app/src/androidTest/java/id/ac/ui/cs/myui/PanicButtonTestSuite.java
+++ b/app/src/androidTest/java/id/ac/ui/cs/myui/PanicButtonTestSuite.java
@@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule;
 import org.junit.Rule;
 import org.junit.Test;
 
-import id.ac.ui.cs.myui.activity.epic_1.news.NewsHomeActivity;
+import id.ac.ui.cs.myui.activity.news.NewsHomeActivity;
 import id.ac.ui.cs.myui.helper.MethodHelper;
 import id.ac.ui.cs.myui.helper.OpenNavigationDrawer;
 import id.ac.ui.cs.myui.pageObject.PanicButtonPageObject;
diff --git a/app/src/androidTest/java/id/ac/ui/cs/myui/ScheduleTestSuite.java b/app/src/androidTest/java/id/ac/ui/cs/myui/ScheduleTestSuite.java
index 5e6f2fabfb9c0dacae514a62ba8d09ffa837e8c9..820f1c1dea7f24afdb6538b239efb66cc20fb745 100644
--- a/app/src/androidTest/java/id/ac/ui/cs/myui/ScheduleTestSuite.java
+++ b/app/src/androidTest/java/id/ac/ui/cs/myui/ScheduleTestSuite.java
@@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule;
 import org.junit.Rule;
 import org.junit.Test;
 
-import id.ac.ui.cs.myui.activity.epic_2.schedule.ScheduleActivity;
+import id.ac.ui.cs.myui.activity.schedule.ScheduleActivity;
 import id.ac.ui.cs.myui.helper.OpenNavigationDrawer;
 import id.ac.ui.cs.myui.pageObject.SchedulePageObject;
 
diff --git a/app/src/main/java/id/ac/ui/cs/myui/activity/DrawerActivity.java b/app/src/main/java/id/ac/ui/cs/myui/activity/DrawerActivity.java
index 727d099f3729cbcb06955eb772e665845b73c176..d25915b93160c895ddfd5921b730ffa5d2b546b5 100644
--- a/app/src/main/java/id/ac/ui/cs/myui/activity/DrawerActivity.java
+++ b/app/src/main/java/id/ac/ui/cs/myui/activity/DrawerActivity.java
@@ -134,7 +134,7 @@ public class DrawerActivity extends AppCompatActivity
                 setDrawer(id, getApplicationContext(), BookmarkNewsActivity.class);
                 break;
             case R.id.panic_button_drawer:
-                checkSession(id, getApplicationContext(), PanicButtonActivity.class);
+                setDrawer(id, getApplicationContext(), PanicButtonActivity.class);
                 break;
             case R.id.about:
                 setDrawer(id, getApplicationContext(), AboutActivity.class);
@@ -145,6 +145,7 @@ public class DrawerActivity extends AppCompatActivity
                     caseDrawer(getApplicationContext(), LoginActivity.class);
                 } else {
                     AlertDialog.Builder dialog = new AlertDialog.Builder(DrawerActivity.this);
+                    dialog.setTitle("MyUI");
                     dialog.setMessage(getResources().getString(R.string.confirmation));
 
                     dialog.setPositiveButton(getResources().getString(R.string.logout_option), new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/id/ac/ui/cs/myui/activity/panic_button/PanicButtonActivity.java b/app/src/main/java/id/ac/ui/cs/myui/activity/panic_button/PanicButtonActivity.java
index 8d4222def78be49de44f6916fd5327eb1dd2d785..2cbbb6f3714436608bcaa561ff51bfd1009090f7 100644
--- a/app/src/main/java/id/ac/ui/cs/myui/activity/panic_button/PanicButtonActivity.java
+++ b/app/src/main/java/id/ac/ui/cs/myui/activity/panic_button/PanicButtonActivity.java
@@ -21,9 +21,7 @@ import android.widget.Button;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-
 import id.ac.ui.cs.myui.R;
-import id.ac.ui.cs.myui.activity.LoginActivity;
 import id.ac.ui.cs.myui.activity.news.NewsHomeActivity;
 import id.ac.ui.cs.myui.helper.android_helper.FallbackLocationTracker;
 import id.ac.ui.cs.myui.task.PanicLogTask;
@@ -46,7 +44,6 @@ public class PanicButtonActivity extends AppCompatActivity {
         setContentView(R.layout.activity_panic_button);
         sharedPreferences=getApplicationContext().getSharedPreferences("user",0);
         setTitle(getResources().getString(R.string.nav_panic_button));
-        checkSession();
 
         if (getSupportActionBar() != null) {
             getSupportActionBar().setElevation(0);
@@ -59,18 +56,15 @@ public class PanicButtonActivity extends AppCompatActivity {
         hasPressed = false;
 
         getPermission();
-
-
-
-
-
     }
 
-    public void checkSession() {
+    public boolean checkSession() {
         if (sharedPreferences.getString("access_token", "").equals("")) {
-            Intent i = new Intent(context, LoginActivity.class);
-            startActivity(i);
+//            Intent i = new Intent(context, LoginActivity.class);
+//            startActivity(i);
+            return false;
         }
+        return true;
     }
 
     public void addListenerButton(String location) {
@@ -93,8 +87,11 @@ public class PanicButtonActivity extends AppCompatActivity {
                     hasPressed = true;
                     panicButton.setBackgroundResource(R.drawable.panic_button_toggle);
                     tvPressHold.setText(getString(R.string.panic_calling) + " " + number);
-                    callPKL();
-                    String username = sharedPreferences.getString("username","");
+                    callPLK();
+                    String username = "Unknown Name";
+                    if(checkSession()) {
+                        username = sharedPreferences.getString("username","");
+                    }
                     new PanicLogTask(getApplicationContext()).execute(username, convertNumber(number), loc);
                 } else {
                     tvPressHold.setVisibility(View.GONE);
@@ -123,7 +120,7 @@ public class PanicButtonActivity extends AppCompatActivity {
         });
     }
 
-    public void callPKL() {
+    public void callPLK() {
         Intent callIntent = new Intent(Intent.ACTION_CALL);
         callIntent.setData(Uri.parse("tel:" + telpNumber));
         if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {