diff --git a/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java b/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java
index 197910e0a..8089ef6dc 100644
--- a/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java
+++ b/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java
@@ -419,6 +419,7 @@ private void writeLogToFile(long timestamp, float readingX, float readingY, floa
     }
 
     private void visualizeData() {
+        if (!isAdded()) return;
         for (int i = 0; i < accelerometerViewFragments.size(); i++) {
             AccelerometerViewFragment fragment = accelerometerViewFragments.get(i);
             long timeElapsed = (System.currentTimeMillis() - startTime) / 1000;
diff --git a/app/src/main/res/layout/fragment_accelerometer_data.xml b/app/src/main/res/layout/fragment_accelerometer_data.xml
index 5905abaa2..6bcff780a 100644
--- a/app/src/main/res/layout/fragment_accelerometer_data.xml
+++ b/app/src/main/res/layout/fragment_accelerometer_data.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@+id/accelerometer_linearlayout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    tools:context="io.pslab.activity.AccelerometerActivity">
+    android:fitsSystemWindows="true">
 
-    <fragment
-        android:id="@+id/accelerometer_x_axis_fragment"
-        android:name="io.pslab.fragment.AccelerometerViewFragment"
+    <LinearLayout
+        android:id="@+id/accelerometer_linearlayout"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_margin="5dp"
-        tools:layout="@layout/accelerometer_list_item" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="5dp"
+        tools:context="io.pslab.activity.AccelerometerActivity">
 
-    <fragment
-        android:id="@+id/accelerometer_y_axis_fragment"
-        android:name="io.pslab.fragment.AccelerometerViewFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_margin="5dp"
-        tools:layout="@layout/accelerometer_list_item" />
+        <fragment
+            android:id="@+id/accelerometer_x_axis_fragment"
+            android:name="io.pslab.fragment.AccelerometerViewFragment"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/accelerometer_fragment_height"
+            android:layout_marginBottom="@dimen/accelerometer_fragment_margint"
+            tools:layout="@layout/accelerometer_list_item" />
 
-    <fragment
-        android:id="@+id/accelerometer_z_axis_fragment"
-        android:name="io.pslab.fragment.AccelerometerViewFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        tools:layout="@layout/accelerometer_list_item" />
-</LinearLayout>
\ No newline at end of file
+        <fragment
+            android:id="@+id/accelerometer_y_axis_fragment"
+            android:name="io.pslab.fragment.AccelerometerViewFragment"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/accelerometer_fragment_height"
+            android:layout_marginBottom="@dimen/accelerometer_fragment_margint"
+            tools:layout="@layout/accelerometer_list_item" />
+
+        <fragment
+            android:id="@+id/accelerometer_z_axis_fragment"
+            android:name="io.pslab.fragment.AccelerometerViewFragment"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/accelerometer_fragment_height"
+            android:layout_marginBottom="@dimen/accelerometer_fragment_margint"
+            tools:layout="@layout/accelerometer_list_item" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f643ff4a5..8f4b22ab5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -421,6 +421,9 @@
     <dimen name="text_size_osc">13sp</dimen>
     <dimen name="text_size_9sp">9sp</dimen>
 
+    <dimen name="accelerometer_fragment_height">200dp</dimen>
+    <dimen name="accelerometer_fragment_margint">5dp</dimen>
+
     <dimen name="gyroscope_fragment_height">300dp</dimen>
     <dimen name="gyroscope_fragment_margin">5dp</dimen>