diff --git a/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java b/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java
index f705b60..5ec0d77 100644
--- a/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java
+++ b/app/src/main/java/com/example/hochi/nextcompanion/MainActivity.java
@@ -154,8 +154,7 @@ public class MainActivity extends AppCompatActivity implements AsyncTaskCallback
                         String bID = bike.getString("bike");
                         String stID = bike.getString("start_place");
                         String lockE = bike.getString("electric_lock");
-                        String gps = bike.getString("gps_tracking");
-                        String[] bikeArray = {bID, stID, lockE, gps};
+                        String[] bikeArray = {bID, stID, lockE};
                         intent.putExtra("bike", bikeArray);
                         startActivity(intent);
                     }
diff --git a/app/src/main/java/com/example/hochi/nextcompanion/ReturnActivity.java b/app/src/main/java/com/example/hochi/nextcompanion/ReturnActivity.java
index a232dd1..483bd7e 100644
--- a/app/src/main/java/com/example/hochi/nextcompanion/ReturnActivity.java
+++ b/app/src/main/java/com/example/hochi/nextcompanion/ReturnActivity.java
@@ -24,7 +24,7 @@ public class ReturnActivity extends AppCompatActivity implements AsyncTaskCallba
         //if GPS and electric lock, show the instruction
         TextView tv = findViewById(R.id.gps_info);
         LinearLayout la = findViewById(R.id.return_form_container);
-        if(bikeArray[2].equals("true") && bikeArray[3].equals("true")) {
+        if(bikeArray[2].equals("true")) {
             tv.setVisibility(View.VISIBLE);
             la.setVisibility(View.INVISIBLE);
         }
diff --git a/app/src/main/res/layout/activity_return.xml b/app/src/main/res/layout/activity_return.xml
index fd3cd0e..5728d58 100644
--- a/app/src/main/res/layout/activity_return.xml
+++ b/app/src/main/res/layout/activity_return.xml
@@ -20,13 +20,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <TextView
-                android:id="@+id/gps_info"
-                android:gravity="center"
-                android:textSize="20sp"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/indicator_electronic_gps_lock" />
             <LinearLayout
                 android:id="@+id/return_form_container"
                 android:layout_width="match_parent"
@@ -56,6 +49,14 @@
                     android:text="@string/action_return_submit"
                     android:textStyle="bold" />
             </LinearLayout>
+
+            <TextView
+                android:id="@+id/gps_info"
+                android:gravity="center"
+                android:textSize="20sp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/indicator_electronic_lock" />
         </LinearLayout>
     </ScrollView>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file