diff --git a/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java b/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
index 8351817..3611ec7 100644
--- a/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
+++ b/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
@@ -29,7 +29,8 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
     private Sensor accelerometerSensor;
     private TextView accelerometerStatusMessage;
     private TextView accelerometerDataTV;
-    private TextView accelerometerWarningTV;
+    private TextView tvAccelerometerdeviceListRecyclerView;
+    private TextView tvAccelerometeralarmHistoryListRecyclerView;
     private Button backToMainActivityButton;
     private AccelerometerViewModel mAccelerometerViewModel;
     private Permission permission = new Permission();
@@ -41,7 +42,8 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
 
         accelerometerStatusMessage = (TextView) findViewById(R.id.tvAccelerometerStatusmessage);
         accelerometerDataTV = (TextView) findViewById(R.id.tvAccelerometerData);
-        accelerometerWarningTV = (TextView) findViewById(R.id.tvAccelerometerWarning);
+        tvAccelerometerdeviceListRecyclerView = (TextView) findViewById(R.id.tvAccelerometerdeviceListRecyclerView);
+        tvAccelerometeralarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAccelerometeralarmHistoryListRecyclerView);
         backToMainActivityButton = (Button) findViewById(R.id.accelerometerBackToMainActivity);
 
         RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
diff --git a/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java b/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java
index e9f4d12..987d3b3 100644
--- a/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java
+++ b/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java
@@ -23,6 +23,8 @@ import java.util.List;
 
 public class AudiodetectionActivity extends AppCompatActivity {
     private TextView microfonStatusMessage;
+    private TextView tvAAudiodetectionAlarmHistoryListRecyclerView;
+    private TextView tvAudiodetectionDeviceListRecyclerView;
     private Button backToMainActivityButton;
     private Permission permission = new Permission();
     private MicrofonViewModel mMicrofonViewModel;
@@ -33,6 +35,8 @@ public class AudiodetectionActivity extends AppCompatActivity {
         setContentView(R.layout.activity_audiodetection);
 
         microfonStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionStatusmessage);
+        tvAAudiodetectionAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAlarmHistoryListRecyclerView);
+        tvAudiodetectionDeviceListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionDeviceListRecyclerView);
         backToMainActivityButton = (Button) findViewById(R.id.audiodetectorBackToMainActivity);
 
         RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
diff --git a/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java b/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java
index a06f64d..c22fcb9 100644
--- a/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java
+++ b/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java
@@ -28,6 +28,8 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
     private SensorManager accelerometerManager;
     private Sensor accelerometerSensor;
     private TextView audiodetectionAndAccelerometerStatusMessage;
+    private TextView tvAudiodetectionAndAccelerometerDeviceListRecyclerView;
+    private TextView tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView;
     private AudiodetectionAndAccelerometerViewModel mAudiodetectionAndAccelerometerViewModel;
     private Button backToMainActivity;
 
@@ -39,6 +41,8 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
         setContentView(R.layout.activity_audiodetection_and_accelerometer);
 
         audiodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerStatusmessage);
+        tvAudiodetectionAndAccelerometerDeviceListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerDeviceListRecyclerView);
+        tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView);
         backToMainActivity = (Button) findViewById(R.id.audiodetectionAndAccelerometerBackToMainActivity);
 
         RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
diff --git a/app/src/main/java/com/example/greenwatch/MainActivity.java b/app/src/main/java/com/example/greenwatch/MainActivity.java
index e2f9721..5051ca7 100644
--- a/app/src/main/java/com/example/greenwatch/MainActivity.java
+++ b/app/src/main/java/com/example/greenwatch/MainActivity.java
@@ -30,6 +30,9 @@ public class MainActivity extends AppCompatActivity {
     private Button accelerometerButton;
     private Button audiodetectionAndAccelerometerButton;
     private Button videodetectionAndAccelerometerButton;
+    private TextView tvMainActivityDeviceListRecyclerView;
+    private TextView tvMainActivityAlarmHistoryListRecyclerView;
+    private SurfaceView surfaceView;
     private MainActivityViewModel mMainActivityViewModel;
     private Permission permission = new Permission();
 
@@ -44,6 +47,9 @@ public class MainActivity extends AppCompatActivity {
         activity = MainActivity.this;
         context = MainActivity.this;
 
+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewMainActivity);
+        tvMainActivityDeviceListRecyclerView = (TextView) findViewById(R.id.tvMainActivityDeviceListRecyclerView);
+        tvMainActivityAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvMainActivityAlarmHistoryListRecyclerView);
         audiodetectionButton = (Button) findViewById(R.id.audiodetectionButton);
         videodetectionButton = (Button) findViewById(R.id.videodetectionButton);
         accelerometerButton = (Button) findViewById(R.id.accelerometerButton);
diff --git a/app/src/main/java/com/example/greenwatch/VideodetectionActivity.java b/app/src/main/java/com/example/greenwatch/VideodetectionActivity.java
index 84490ff..9d70414 100644
--- a/app/src/main/java/com/example/greenwatch/VideodetectionActivity.java
+++ b/app/src/main/java/com/example/greenwatch/VideodetectionActivity.java
@@ -26,6 +26,9 @@ import java.util.concurrent.ExecutionException;
 public class VideodetectionActivity extends AppCompatActivity {
 
     private Button backToMainActivity;
+    private SurfaceView surfaceView;
+    private TextView tvVideodetectionDeviceListRecyclerView;
+    private TextView tvVideodetectionAlarmHistoryListRecyclerView;
     private VideodetectionViewModel mVideoDetectionViewModel;
     private Permission permission = new Permission();
 
@@ -34,6 +37,9 @@ public class VideodetectionActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_videodetection);
 
+        surfaceView = (SurfaceView) findViewById(R.id.surfaceViewVideodetection);
+        tvVideodetectionDeviceListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionDeviceListRecyclerView);
+        tvVideodetectionAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAlarmHistoryListRecyclerView);
         backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
 
         RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
diff --git a/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java b/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java
index 353b496..8d72977 100644
--- a/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java
+++ b/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java
@@ -34,7 +34,8 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
     private Sensor accelerometerSensor;
     private TextView videodetectionAndAccelerometerStatusMessage;
     private TextView videodetectionAndAccelerometerDataTV;
-    private TextView videodetectionAndAccelerometerWarningTV;
+    private TextView tvVideodetectionAndAccelerometerDeviceListRecyclerView;
+    private TextView tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView;
     private Button backToMainActivity;
     private VideodetectionAndAccelerometerViewModel mVideodetectionAndAccelerometerViewModel;
     private Permission permission = new Permission();
@@ -46,7 +47,8 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
 
         videodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerStatusmessage);
         videodetectionAndAccelerometerDataTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerData);
-        videodetectionAndAccelerometerWarningTV = (TextView) findViewById(R.id.tvvideodetectionAndAccelerometerWarning);
+        tvVideodetectionAndAccelerometerDeviceListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAndAccelerometerDeviceListRecyclerView);
+        tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView = (TextView) findViewById(R.id.tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView);
         backToMainActivity = (Button) findViewById(R.id.videodetectionAndAccelerometerBackToMainActivity);
 
         RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
diff --git a/app/src/main/res/layout/activity_accelerometer.xml b/app/src/main/res/layout/activity_accelerometer.xml
index b90e124..6c9aced 100644
--- a/app/src/main/res/layout/activity_accelerometer.xml
+++ b/app/src/main/res/layout/activity_accelerometer.xml
@@ -8,11 +8,19 @@
     android:padding="10dp"
     tools:context=".AccelerometerActivity">
 
+    <SurfaceView
+        android:id="@+id/surfaceViewAccelerometer"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
     <TextView
         android:id="@+id/tvAccelerometerStatusmessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="">
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Accelerometer Activity">
     </TextView>
 
     <TextView
@@ -22,13 +30,6 @@
         android:text="">
     </TextView>
 
-    <TextView
-        android:id="@+id/tvAccelerometerWarning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="">
-    </TextView>
-
     <Button
         android:id="@+id/accelerometerBackToMainActivity"
         android:layout_width="match_parent"
@@ -41,6 +42,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tvAccelerometerdeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceListRecyclerView"
             android:layout_width="match_parent"
@@ -49,6 +58,14 @@
             android:layout_weight="1">
         </androidx.recyclerview.widget.RecyclerView>
 
+        <TextView
+            android:id="@+id/tvAccelerometeralarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/alarmHistoryListRecyclerView"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_audiodetection.xml b/app/src/main/res/layout/activity_audiodetection.xml
index 95ca5e4..25b4e30 100644
--- a/app/src/main/res/layout/activity_audiodetection.xml
+++ b/app/src/main/res/layout/activity_audiodetection.xml
@@ -8,10 +8,25 @@
     android:padding="10dp"
     tools:context=".AudiodetectionActivity">
 
+    <SurfaceView
+        android:id="@+id/surfaceViewAudio"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
     <TextView
         android:id="@+id/tvAudiodetectionStatusmessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Audiodetection Activity">
+    </TextView>
+
+    <TextView
+        android:id="@+id/tvAudiodetectionData"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:text="">
     </TextView>
 
@@ -27,6 +42,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tvAudiodetectionDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceListRecyclerView"
             android:layout_width="match_parent"
@@ -35,6 +58,14 @@
             android:layout_weight="1">
         </androidx.recyclerview.widget.RecyclerView>
 
+        <TextView
+            android:id="@+id/tvAudiodetectionAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/alarmHistoryListRecyclerView"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_audiodetection_and_accelerometer.xml b/app/src/main/res/layout/activity_audiodetection_and_accelerometer.xml
index 4ecd973..df2b7d7 100644
--- a/app/src/main/res/layout/activity_audiodetection_and_accelerometer.xml
+++ b/app/src/main/res/layout/activity_audiodetection_and_accelerometer.xml
@@ -8,11 +8,19 @@
     android:padding="10dp"
     tools:context=".AudiodetectionAndAccelerometerActivity">
 
+    <SurfaceView
+        android:id="@+id/surfaceViewAudiodetectionAndAccelerometer"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
     <TextView
         android:id="@+id/tvAudiodetectionAndAccelerometerStatusmessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Audiodetection + Accelerometer Activity">
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Audiodetection+Accelerometer Activity">
     </TextView>
 
     <Button
@@ -27,6 +35,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tvAudiodetectionAndAccelerometerDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceListRecyclerView"
             android:layout_width="match_parent"
@@ -35,6 +51,14 @@
             android:layout_weight="1">
         </androidx.recyclerview.widget.RecyclerView>
 
+        <TextView
+            android:id="@+id/tvAudiodetectionAndAccelerometerAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/alarmHistoryListRecyclerView"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6490ad6..950b8a2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,6 +8,29 @@
     android:padding="5dp"
     tools:context=".MainActivity">
 
+    <TextView
+        android:id="@+id/tvMainActivityDeviceListRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Registered Devices">
+    </TextView>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/deviceListRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="3"
+        tools:listitem="@layout/device_item">
+    </androidx.recyclerview.widget.RecyclerView>
+
+    <TextView
+        android:id="@+id/tvMainActivityAlarmHistoryListRecyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Alarm History List">
+    </TextView>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/alarmHistoryListRecyclerView"
@@ -17,13 +40,11 @@
         tools:listitem="@layout/alarm_history_item">
     </androidx.recyclerview.widget.RecyclerView>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/deviceListRecyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="3"
-        tools:listitem="@layout/device_item">
-    </androidx.recyclerview.widget.RecyclerView>
+    <SurfaceView
+        android:id="@+id/surfaceViewMainActivity"
+        android:layout_width="1dp"
+        android:layout_height="1dp">
+    </SurfaceView>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_videodetection.xml b/app/src/main/res/layout/activity_videodetection.xml
index d7bfb3c..a4ab242 100644
--- a/app/src/main/res/layout/activity_videodetection.xml
+++ b/app/src/main/res/layout/activity_videodetection.xml
@@ -8,10 +8,18 @@
     android:padding="10dp"
     tools:context=".VideodetectionActivity">
 
+    <SurfaceView
+        android:id="@+id/surfaceViewVideodetection"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
     <TextView
         android:id="@+id/tvVideodetectionStatusmessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:text="Videodetection Activity">
     </TextView>
 
@@ -27,6 +35,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tvVideodetectionDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceListRecyclerView"
             android:layout_width="match_parent"
@@ -35,6 +51,14 @@
             android:layout_weight="1">
         </androidx.recyclerview.widget.RecyclerView>
 
+        <TextView
+            android:id="@+id/tvVideodetectionAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/alarmHistoryListRecyclerView"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_videodetection_and_accelerometer.xml b/app/src/main/res/layout/activity_videodetection_and_accelerometer.xml
index 7a024b1..552e806 100644
--- a/app/src/main/res/layout/activity_videodetection_and_accelerometer.xml
+++ b/app/src/main/res/layout/activity_videodetection_and_accelerometer.xml
@@ -8,11 +8,19 @@
     android:padding="10dp"
     tools:context=".VideodetectionAndAccelerometerActivity">
 
+    <SurfaceView
+        android:id="@+id/surfaceViewVideodetectionAndAccelerometer"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:visibility="visible">
+    </SurfaceView>
+
     <TextView
         android:id="@+id/tvvideodetectionAndAccelerometerStatusmessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="">
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:text="Videodetection+Accelerometer Activity">
     </TextView>
 
     <TextView
@@ -22,13 +30,6 @@
         android:text="">
     </TextView>
 
-    <TextView
-        android:id="@+id/tvvideodetectionAndAccelerometerWarning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="">
-    </TextView>
-
     <Button
         android:id="@+id/videodetectionAndAccelerometerBackToMainActivity"
         android:layout_width="match_parent"
@@ -41,6 +42,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tvVideodetectionAndAccelerometerDeviceListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Registered Devices">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/deviceListRecyclerView"
             android:layout_width="match_parent"
@@ -49,6 +58,14 @@
             android:layout_weight="1">
         </androidx.recyclerview.widget.RecyclerView>
 
+        <TextView
+            android:id="@+id/tvVideodetectionAndAccelerometerAlarmHistoryListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:text="Alarm History List">
+        </TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/alarmHistoryListRecyclerView"
             android:layout_width="match_parent"