diff --git a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
index ee6422d65..8246fde42 100644
--- a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
+++ b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
@@ -200,6 +200,8 @@ public class WaveGeneratorActivity extends AppCompatActivity {
     private boolean isPlayingSound = false;
     private ProduceSoundTask produceSoundTask;
 
+    private AudioTrack track;
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -1311,8 +1313,6 @@ public final int getValue() {
 
     private class ProduceSoundTask extends AsyncTask<Void, Void, Void> {
 
-        private AudioTrack track;
-
         @Override
         protected Void doInBackground(Void... voids) {
             short[] buffer = new short[1024];
@@ -1349,9 +1349,11 @@ protected Void doInBackground(Void... voids) {
         @Override
         protected void onCancelled() {
             super.onCancelled();
-            track.flush();
-            track.stop();
-            track.release();
+            if (track != null) {
+                track.flush();
+                track.stop();
+                track.release();
+            }
         }
     }
 }
diff --git a/app/src/main/res/layout-sw600dp/activity_oscilloscope.xml b/app/src/main/res/layout-sw600dp/activity_oscilloscope.xml
deleted file mode 100644
index cfc3f7007..000000000
--- a/app/src/main/res/layout-sw600dp/activity_oscilloscope.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:keepScreenOn="true"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/layout_chart_os"
-        android:layout_width="1000dp"
-        android:layout_height="600dp">
-
-        <com.github.mikephil.charting.charts.LineChart
-            android:id="@+id/chart_os"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@+id/chart_xaxis_layout"
-            android:layout_toEndOf="@+id/chart_yaxis_layout1"
-            android:layout_toLeftOf="@+id/chart_yaxis_layout2"
-            android:layout_toRightOf="@+id/chart_yaxis_layout1"
-            android:layout_toStartOf="@+id/chart_yaxis_layout2"
-            android:background="#000" />
-
-        <RelativeLayout
-            android:id="@+id/chart_xaxis_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:background="#000"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_graph_label_xaxis_os"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="center_vertical|center_horizontal|center"
-                android:foregroundGravity="center_vertical"
-                android:gravity="center_vertical|center_horizontal|center"
-                android:text="@string/time_space"
-                android:textColor="#ffff"
-                android:textSize="12sp"
-                android:textStyle="normal|bold"
-                tools:layout_editor_absoluteX="288dp"
-                tools:layout_editor_absoluteY="0dp" />
-
-            <TextView
-                android:id="@+id/tv_unit_xaxis_os"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_toEndOf="@+id/tv_graph_label_xaxis_os"
-                android:layout_toRightOf="@+id/tv_graph_label_xaxis_os"
-                android:text="@string/unit_μs"
-                android:textColor="#ffff"
-                android:textSize="12sp"
-                android:textStyle="normal|bold"
-                app:layout_constraintLeft_toRightOf="@+id/tv_graph_label_xaxis_os"
-                tools:layout_editor_absoluteY="0dp" />
-        </RelativeLayout>
-
-
-        <android.support.constraint.ConstraintLayout
-            android:id="@+id/chart_yaxis_layout1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:background="#000"
-            android:foregroundGravity="center_vertical"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_label_left_yaxis_os"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="16dp"
-                android:layout_marginTop="16dp"
-                android:foregroundGravity="center_horizontal"
-                android:gravity="top|center_horizontal"
-                android:includeFontPadding="false"
-                android:rotation="-90"
-                android:text="@string/label_ch1"
-                android:textColor="#ffff"
-                android:textSize="12sp"
-                android:textStyle="normal|bold"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_unit_left_yaxis_os"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_above="@+id/tv_label_left_yaxis_os"
-                android:layout_marginBottom="8dp"
-                android:rotation="-90"
-                android:text="@string/label_V"
-                android:textColor="#fff"
-                android:textSize="12sp"
-                android:textStyle="normal|bold"
-                app:layout_constraintBottom_toTopOf="@+id/tv_label_left_yaxis_os"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
-
-        </android.support.constraint.ConstraintLayout>
-
-        <android.support.constraint.ConstraintLayout
-            android:id="@+id/chart_yaxis_layout2"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="#000"
-            android:foregroundGravity="right"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/tv_label_right_yaxis_os"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="16dp"
-                android:layout_marginTop="16dp"
-                android:foregroundGravity="center_horizontal"
-                android:gravity="center_horizontal"
-                android:includeFontPadding="false"
-                android:rotation="-90"
-                android:text="@string/label_ch2"
-                android:textColor="#ffff"
-                android:textSize="12sp"
-                android:textStyle="normal|bold"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_unit_right_yaxis_os"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:rotation="-90"
-                android:text="@string/label_V"
-                android:textColor="#fff"
-                android:textSize="12sp"
-                app:layout_constraintBottom_toTopOf="@+id/tv_label_right_yaxis_os"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent" />
-
-            <ImageView
-                android:id="@+id/imageView_led_os"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:srcCompat="@drawable/red_led" />
-
-        </android.support.constraint.ConstraintLayout>
-
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/layout_dock_os1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_toEndOf="@+id/layout_chart_os"
-        android:layout_toRightOf="@+id/layout_chart_os"
-        android:layout_weight="1"
-        android:background="@drawable/rounded_custom_border_2"
-        android:orientation="vertical">
-
-        <ImageButton
-            android:id="@+id/button_channel_parameters_os"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="1dp"
-            android:layout_weight="2"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/channel_parameters" />
-
-        <TextView
-            android:id="@+id/tv_channel_parameters_os"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/channel_parameters"
-            android:textAlignment="center"
-            android:textColor="#000"
-            android:textSize="18sp"
-            android:textStyle="normal|bold" />
-
-        <ImageButton
-            android:id="@+id/button_timebase_os"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="2"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/timebase" />
-
-        <TextView
-            android:id="@+id/tv_timebase_tigger_os"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/timebase_and_trigger"
-            android:textAlignment="center"
-            android:textColor="#000"
-            android:textSize="18sp"
-            android:textStyle="normal|bold" />
-
-        <ImageButton
-            android:id="@+id/button_data_analysis_os"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="1dp"
-            android:layout_weight="2"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/data_analysis" />
-
-        <TextView
-            android:id="@+id/tv_data_analysis_os"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLines="1"
-            android:text="@string/data_analysis"
-            android:textAlignment="center"
-            android:textColor="#000"
-            android:textSize="18sp"
-            android:textStyle="normal|bold" />
-
-        <ImageButton
-            android:id="@+id/button_xy_plot_os"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="1dp"
-
-            android:layout_weight="2"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/xymode" />
-
-        <TextView
-            android:id="@+id/tv_xy_plot_os"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="2dp"
-            android:elevation="24dp"
-            android:gravity="center"
-            android:text="@string/xy_plot"
-            android:textAlignment="center"
-            android:textColor="#000"
-            android:textSize="18sp"
-            android:textStyle="normal|bold" />
-
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/layout_dock_os2"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_below="@+id/layout_chart_os"
-        android:layout_marginLeft="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_toLeftOf="@+id/layout_dock_os1"
-        android:layout_toStartOf="@+id/layout_dock_os1">
-
-    </FrameLayout>
-
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_oscilloscope.xml b/app/src/main/res/layout/activity_oscilloscope.xml
index c6a94168e..aa403543e 100644
--- a/app/src/main/res/layout/activity_oscilloscope.xml
+++ b/app/src/main/res/layout/activity_oscilloscope.xml
@@ -17,8 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/top_app_bar_layout"
-            android:layout_marginTop="@dimen/osc_main_margin"
-            android:layout_marginStart="@dimen/osc_main_margin">
+            android:layout_marginStart="@dimen/osc_main_margin"
+            android:layout_marginTop="@dimen/osc_main_margin">
 
             <RelativeLayout
                 android:id="@+id/layout_chart_os"
@@ -190,12 +190,12 @@
                 android:id="@+id/layout_dock_os1"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginEnd="@dimen/osc_main_margin"
+                android:layout_marginBottom="@dimen/osc_main_margin"
                 android:layout_toEndOf="@+id/layout_chart_os"
                 android:layout_toRightOf="@+id/layout_chart_os"
                 android:background="@drawable/rounded_custom_border_2"
-                android:orientation="vertical"
-                android:layout_marginBottom="@dimen/osc_main_margin"
-                android:layout_marginEnd="@dimen/osc_main_margin">
+                android:orientation="vertical">
 
                 <ImageButton
                     android:id="@+id/button_channel_parameters_os"
@@ -311,12 +311,11 @@
                 android:layout_height="match_parent"
                 android:layout_below="@+id/layout_chart_os"
                 android:layout_alignParentStart="true"
-                android:layout_marginEnd="@dimen/osc_main_margin"
                 android:layout_marginTop="@dimen/osc_main_margin"
+                android:layout_marginEnd="@dimen/osc_main_margin"
                 android:layout_marginBottom="@dimen/osc_main_margin"
-                android:layout_toStartOf="@+id/layout_dock_os1">
+                android:layout_toStartOf="@+id/layout_dock_os1" />
 
-            </FrameLayout>
         </RelativeLayout>
 
         <View
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 08792ef42..09aab9591 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -11,5 +11,7 @@
     <dimen name="ctrl_title_text_margin">3dp</dimen>
     <dimen name="btn_min_width">80dp</dimen>
     <dimen name="mon_title_sep_margin">16dp</dimen>
-
+    <dimen name="extra_space_top">72dp</dimen>
+    <dimen name="osc_chart_width">1000dp</dimen>
+    <dimen name="osc_chart_height">600dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f600d426..403f0fb9a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -297,9 +297,9 @@
     <string name="pressure">Pressure</string>
     <string name="gyro_range">Set Gyro Range</string>
     <string name="accel_range">Set Accel Range</string>
-    <string name="kalman">Kalman filter</string>
+    <string name="kalman">Kalman Filter</string>
     <string name="power_up">Power Up</string>
-    <string name="full_spectrum">Full spectrum</string>
+    <string name="full_spectrum">Full Spectrum</string>
     <string name="infrared">Infrared</string>
     <string name="visible">Visible</string>
     <string name="set_gain">Set Gain</string>
@@ -448,7 +448,7 @@
     <string name="scanning">Scanning...</string>
 
     <string name="voltage_unit">(V)</string>
-    <string name="volts">volts</string>
+    <string name="volts">Volts</string>
     <string name="seconds">(s)</string>
     <string name="lux">Lx</string>
     <string name="pressure2">Press.</string>