diff --git a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
index eb2fec9e3..991d826c1 100644
--- a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
+++ b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
@@ -79,10 +79,6 @@ public class WaveGeneratorActivity extends AppCompatActivity {
     private final String MODE_SQUARE = "Square";
     private final String MODE_PWM = "PWM";
     //waveform monitor
-    @BindView(R.id.wave_mon_wave1)
-    TextView waveMonWave1;
-    @BindView(R.id.wave_mon_wave2)
-    TextView waveMonWave2;
     @BindView(R.id.wave_ic_img)
     ImageView selectedWaveImg;
     @BindView(R.id.wave_mon_select_wave)
@@ -100,14 +96,6 @@ public class WaveGeneratorActivity extends AppCompatActivity {
     ImageView pwmSelectedModeImg;
     @BindView(R.id.pwm_mon_mode_select)
     TextView pwmMonSelectMode;
-    @BindView(R.id.pwm_mon_sq1)
-    TextView pwmMonSqr1;
-    @BindView(R.id.pwm_mon_sq2)
-    TextView pwmMonSqr2;
-    @BindView(R.id.pwm_mon_sq3)
-    TextView pwmMonSqr3;
-    @BindView(R.id.pwm_mon_sq4)
-    TextView pwmMonSqr4;
     @BindView(R.id.pwm_freq_value)
     TextView pwmFreqValue;
     @BindView(R.id.pwm_phase_value)
@@ -140,8 +128,10 @@ public class WaveGeneratorActivity extends AppCompatActivity {
     Button btnPwmSq3;
     @BindView(R.id.pwm_btn_sq4)
     Button btnPwmSq4;
-    @BindView(R.id.pwm_btn_mode)
-    Button btnPwmMode;
+    @BindView(R.id.analog_mode_btn)
+    Button btnAnalogMode;
+    @BindView(R.id.digital_mode_btn)
+    Button btnDigitalMode;
     @BindView(R.id.pwm_btn_freq)
     Button pwmBtnFreq;
     @BindView(R.id.pwm_btn_duty)
@@ -179,7 +169,6 @@ public class WaveGeneratorActivity extends AppCompatActivity {
     private CSVLogger csvLogger;
     private WaveConst waveBtnActive, pwmBtnActive, prop_active, digital_mode;
     private TextView activePropTv = null;
-    private TextView activePwmPinTv = null;
     private CoordinatorLayout coordinatorLayout;
     private Realm realm;
     private GPSLogger gpsLogger;
@@ -248,15 +237,6 @@ public void onClick(View view) {
                 }
             }
         });
-        waveMonWave1.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!waveBtnActive.equals(WaveConst.WAVE1)) {
-                    waveMonSelected = true;
-                    selectBtn(WaveConst.WAVE1);
-                }
-            }
-        });
         btnCtrlWave2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -266,15 +246,6 @@ public void onClick(View view) {
                 }
             }
         });
-        waveMonWave2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!waveBtnActive.equals(WaveConst.WAVE2)) {
-                    waveMonSelected = true;
-                    selectBtn(WaveConst.WAVE2);
-                }
-            }
-        });
         imgBtnSin.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -319,31 +290,36 @@ public void onClick(View view) {
             }
         });
 
-        //pwm panel
-        btnPwmMode.setOnClickListener(new View.OnClickListener() {
+        btnAnalogMode.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                WaveGeneratorCommon.intializeDigitalValue();
-                if (digital_mode == WaveConst.SQUARE) {
-                    pwmModeLayout.setVisibility(View.VISIBLE);
-                    pwmModeControls.setVisibility(View.VISIBLE);
-                    squareModeLayout.setVisibility(View.GONE);
-                    squareModeControls.setVisibility(View.GONE);
-                    toggleDigitalMode(WaveConst.PWM);
-                    imgBtnSin.setEnabled(false);
-                    imgBtnTri.setEnabled(false);
-                    pwmBtnActive = WaveConst.SQR1;
-                    selectBtn(WaveConst.SQR1);
-                    Toast.makeText(WaveGeneratorActivity.this, R.string.wave_pin_disable_comment, Toast.LENGTH_SHORT).show();
-                } else {
-                    pwmModeLayout.setVisibility(View.GONE);
-                    pwmModeControls.setVisibility(View.GONE);
-                    squareModeLayout.setVisibility(View.VISIBLE);
-                    squareModeControls.setVisibility(View.VISIBLE);
-                    imgBtnSin.setEnabled(true);
-                    imgBtnTri.setEnabled(true);
-                    toggleDigitalMode(WaveConst.SQUARE);
-                }
+            public void onClick(View v) {
+                pwmModeLayout.setVisibility(View.GONE);
+                pwmModeControls.setVisibility(View.GONE);
+                squareModeLayout.setVisibility(View.VISIBLE);
+                squareModeControls.setVisibility(View.VISIBLE);
+                imgBtnSin.setEnabled(true);
+                imgBtnTri.setEnabled(true);
+                toggleDigitalMode(WaveConst.SQUARE);
+                btnDigitalMode.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnAnalogMode.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+            }
+        });
+
+        btnDigitalMode.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                pwmModeLayout.setVisibility(View.VISIBLE);
+                pwmModeControls.setVisibility(View.VISIBLE);
+                squareModeLayout.setVisibility(View.GONE);
+                squareModeControls.setVisibility(View.GONE);
+                toggleDigitalMode(WaveConst.PWM);
+                imgBtnSin.setEnabled(false);
+                imgBtnTri.setEnabled(false);
+                pwmBtnActive = WaveConst.SQR1;
+                selectBtn(WaveConst.SQR1);
+                Toast.makeText(WaveGeneratorActivity.this, R.string.wave_pin_disable_comment, Toast.LENGTH_SHORT).show();
+                btnDigitalMode.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+                btnAnalogMode.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
             }
         });
 
@@ -696,8 +672,8 @@ public void selectBtn(WaveConst btn_selected) {
 
                 waveBtnActive = WaveConst.WAVE1;
 
-                waveMonWave1.setTextColor(getResources().getColor(R.color.orange));
-                waveMonWave2.setTextColor(getResources().getColor(R.color.dark_grey));
+                btnCtrlWave1.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+                btnCtrlWave2.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
 
                 btnCtrlPhase.setEnabled(false);  //disable phase for wave
                 wavePhaseValue.setText("--");
@@ -712,8 +688,8 @@ public void selectBtn(WaveConst btn_selected) {
 
                 waveBtnActive = WaveConst.WAVE2;
 
-                waveMonWave2.setTextColor(getResources().getColor(R.color.orange));
-                waveMonWave1.setTextColor(getResources().getColor(R.color.dark_grey));
+                btnCtrlWave2.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+                btnCtrlWave1.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
 
                 btnCtrlPhase.setEnabled(true); // enable phase for wave2
 
@@ -725,10 +701,11 @@ public void selectBtn(WaveConst btn_selected) {
                 break;
 
             case SQR1:
-                activePwmPinTv.setEnabled(false);
                 pwmBtnActive = WaveConst.SQR1;
-                activePwmPinTv = pwmMonSqr1;
-                activePwmPinTv.setEnabled(true);
+                btnPwmSq1.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+                btnPwmSq2.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq3.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq4.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
                 pwmBtnPhase.setEnabled(false);  //phase disabled for sq1
                 pwmPhaseValue.setText("--");
                 fetchPropertyValue(pwmBtnActive, WaveConst.FREQUENCY, getString(R.string.unit_hz), pwmFreqValue);
@@ -737,10 +714,11 @@ public void selectBtn(WaveConst btn_selected) {
 
             case SQR2:
 
-                activePwmPinTv.setEnabled(false);
                 pwmBtnActive = WaveConst.SQR2;
-                activePwmPinTv = pwmMonSqr2;
-                activePwmPinTv.setEnabled(true);
+                btnPwmSq1.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq2.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+                btnPwmSq3.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq4.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
                 pwmBtnPhase.setEnabled(true);
                 fetchPropertyValue(pwmBtnActive, WaveConst.PHASE, getString(R.string.deg_text), pwmPhaseValue);
                 fetchPropertyValue(pwmBtnActive, WaveConst.DUTY, getString(R.string.unit_percent), pwmDutyValue);
@@ -748,10 +726,11 @@ public void selectBtn(WaveConst btn_selected) {
 
             case SQR3:
 
-                activePwmPinTv.setEnabled(false);
                 pwmBtnActive = WaveConst.SQR3;
-                activePwmPinTv = pwmMonSqr3;
-                activePwmPinTv.setEnabled(true);
+                btnPwmSq1.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq2.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq3.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+                btnPwmSq4.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
                 pwmBtnPhase.setEnabled(true);
                 fetchPropertyValue(pwmBtnActive, WaveConst.PHASE, getString(R.string.deg_text), pwmPhaseValue);
                 fetchPropertyValue(pwmBtnActive, WaveConst.DUTY, getString(R.string.unit_percent), pwmDutyValue);
@@ -759,10 +738,11 @@ public void selectBtn(WaveConst btn_selected) {
 
             case SQR4:
 
-                activePwmPinTv.setEnabled(false);
                 pwmBtnActive = WaveConst.SQR4;
-                activePwmPinTv = pwmMonSqr4;
-                activePwmPinTv.setEnabled(true);
+                btnPwmSq1.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq2.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq3.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
+                btnPwmSq4.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
                 pwmBtnPhase.setEnabled(true);
                 fetchPropertyValue(pwmBtnActive, WaveConst.PHASE, getString(R.string.deg_text), pwmPhaseValue);
                 fetchPropertyValue(pwmBtnActive, WaveConst.DUTY, getString(R.string.unit_percent), pwmDutyValue);
@@ -770,8 +750,8 @@ public void selectBtn(WaveConst btn_selected) {
 
             default:
                 waveBtnActive = WaveConst.WAVE1;
-                waveMonWave1.setTextColor(getResources().getColor(R.color.orange));
-                waveMonWave2.setTextColor(getResources().getColor(R.color.dark_grey));
+                btnCtrlWave1.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded));
+                btnCtrlWave2.setBackground(getResources().getDrawable(R.drawable.btn_back_rounded_light));
                 btnCtrlPhase.setEnabled(false);  //disable phase for wave
                 wavePhaseValue.setText("--");
                 selectWaveform(WaveGeneratorCommon.wave.get(waveBtnActive).get(WaveConst.WAVETYPE));
@@ -829,10 +809,6 @@ private void toggleDigitalMode(WaveConst mode) {
             btnPwmSq3.setEnabled(true);
             btnPwmSq4.setEnabled(true);
         }
-        pwmMonSqr1.setSelected(false);
-        pwmMonSqr2.setSelected(false);
-        pwmMonSqr3.setSelected(false);
-        pwmMonSqr4.setSelected(false);
         WaveGeneratorCommon.mode_selected = mode;
     }
 
@@ -969,13 +945,11 @@ private void toggleSeekBtns(boolean state) {
 
     private void enableInitialState() {
         selectBtn(WaveConst.WAVE1);
-        activePwmPinTv = pwmMonSqr1;
         toggleDigitalMode(WaveConst.SQUARE);
     }
 
     private void enableInitialStatePWM() {
         selectBtn(WaveConst.SQR2);
-        activePwmPinTv = pwmMonSqr2;
         toggleDigitalMode(WaveConst.PWM);
     }
 
diff --git a/app/src/main/res/drawable/btn_back_rounded.xml b/app/src/main/res/drawable/btn_back_rounded.xml
index f3b6377f4..35e099f47 100644
--- a/app/src/main/res/drawable/btn_back_rounded.xml
+++ b/app/src/main/res/drawable/btn_back_rounded.xml
@@ -4,13 +4,13 @@
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/theme_red_light" />
-            <corners android:radius="5dp" />
+            <corners android:radius="@dimen/button_bg_radius" />
         </shape>
     </item>
     <item android:state_enabled="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/colorPrimary" />
-            <corners android:radius="5dp" />
+            <corners android:radius="@dimen/button_bg_radius" />
         </shape>
     </item>
 </selector>
diff --git a/app/src/main/res/drawable/btn_back_rounded_light.xml b/app/src/main/res/drawable/btn_back_rounded_light.xml
new file mode 100644
index 000000000..0965b8c5b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_back_rounded_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/theme_red_light" />
+    <corners android:radius="@dimen/button_bg_radius" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_arrow_left_24dp.xml b/app/src/main/res/drawable/ic_arrow_left_24dp.xml
new file mode 100644
index 000000000..b79d00f6e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_left_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.41,16.09l-4.58,-4.59 4.58,-4.59L14,5.5l-6,6 6,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right_24dp.xml b/app/src/main/res/drawable/ic_arrow_right_24dp.xml
new file mode 100644
index 000000000..ff5a73fff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_right_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
+</vector>
diff --git a/app/src/main/res/layout/wave_generator_analog_mode_layout.xml b/app/src/main/res/layout/wave_generator_analog_mode_layout.xml
index f30bbc1d1..21cfe7c2e 100644
--- a/app/src/main/res/layout/wave_generator_analog_mode_layout.xml
+++ b/app/src/main/res/layout/wave_generator_analog_mode_layout.xml
@@ -2,8 +2,8 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/square_mode_layout"
-    android:layout_width="@dimen/length_0dp"
-    android:layout_height="@dimen/length_0dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:layout_marginEnd="@dimen/card_separation_offset"
     android:background="@color/black">
 
@@ -15,14 +15,6 @@
         app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
         app:layout_constraintGuide_percent="0.5" />
 
-    <android.support.constraint.Guideline
-        android:id="@+id/fguideline3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
-        app:layout_constraintGuide_percent="0.20" />
-
     <android.support.constraint.Guideline
         android:id="@+id/fguideline9"
         android:layout_width="wrap_content"
@@ -37,7 +29,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
-        app:layout_constraintGuide_percent="0.35" />
+        app:layout_constraintGuide_percent="0.20" />
 
     <ImageView
         android:id="@+id/wave_ic_img"
@@ -46,42 +38,11 @@
         app:layout_constraintBottom_toTopOf="@+id/wave_mon_select_wave"
         app:layout_constraintEnd_toStartOf="@+id/fguideline10"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/fguideline3"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.45"
         app:layout_constraintVertical_chainStyle="packed"
         app:srcCompat="@drawable/ic_triangular" />
 
-    <TextView
-        android:id="@+id/wave_mon_wave1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/mon_title_sep_margin"
-        android:enabled="false"
-        android:text="@string/wave1"
-        android:textColor="@drawable/text_color_selector"
-        android:textSize="@dimen/text_size_wavegen"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/fguideline3"
-        app:layout_constraintEnd_toStartOf="@+id/fguideline2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/wave_mon_wave2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/mon_title_sep_margin"
-        android:enabled="false"
-        android:text="@string/wave2"
-        android:textColor="@drawable/text_color_selector"
-        android:textSize="@dimen/text_size_wavegen"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/wave_mon_wave1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/fguideline2"
-        app:layout_constraintTop_toTopOf="@+id/wave_mon_wave1" />
-
-
     <TextView
         android:id="@+id/wave_mon_select_wave"
         android:layout_width="wrap_content"
@@ -108,7 +69,7 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/wave_phase"
         app:layout_constraintStart_toStartOf="@+id/fguideline10"
-        app:layout_constraintTop_toTopOf="@+id/fguideline3"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -186,20 +147,9 @@
         android:background="@color/dark_grey"
         app:layout_constraintBottom_toTopOf="@+id/fguideline9"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.35"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fguideline3" />
-
-    <View
-        android:layout_width="@dimen/length_0dp"
-        android:layout_height="@dimen/divider_width"
-        android:background="@color/dark_grey"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.20"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.20" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <View
         android:layout_width="@dimen/length_0dp"
diff --git a/app/src/main/res/layout/wave_generator_digital_mode_layout.xml b/app/src/main/res/layout/wave_generator_digital_mode_layout.xml
index 46df71b38..d4bb9d7be 100644
--- a/app/src/main/res/layout/wave_generator_digital_mode_layout.xml
+++ b/app/src/main/res/layout/wave_generator_digital_mode_layout.xml
@@ -2,19 +2,11 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/pwm_mode_layout"
-    android:layout_width="@dimen/length_0dp"
-    android:layout_height="@dimen/length_0dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:layout_marginEnd="@dimen/card_separation_offset"
     android:background="@color/black">
 
-    <android.support.constraint.Guideline
-        android:id="@+id/guideline3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_begin="@dimen/constraint_guide_begin"
-        app:layout_constraintGuide_percent="0.20" />
-
     <android.support.constraint.Guideline
         android:id="@+id/guideline9"
         android:layout_width="wrap_content"
@@ -54,7 +46,7 @@
         app:layout_constraintBottom_toTopOf="@+id/pwm_mon_mode_select"
         app:layout_constraintEnd_toStartOf="@+id/guideline10"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/guideline3"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.45"
         app:layout_constraintVertical_chainStyle="packed"
         app:srcCompat="@drawable/ic_pwm_pic" />
@@ -73,64 +65,6 @@
         app:layout_constraintStart_toStartOf="@+id/pwm_ic_img"
         app:layout_constraintTop_toBottomOf="@+id/pwm_ic_img" />
 
-    <TextView
-        android:id="@+id/pwm_mon_sq1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:enabled="false"
-        android:text="@string/text_sq1"
-        android:textColor="@drawable/text_color_selector"
-        android:textSize="@dimen/text_size_wavegen"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/guideline3"
-        app:layout_constraintEnd_toStartOf="@+id/pwm_mon_sq2"
-        app:layout_constraintStart_toStartOf="@+id/guideline12"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/pwm_mon_sq2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:enabled="false"
-        android:text="@string/text_sq2"
-        android:textColor="@drawable/text_color_selector"
-        android:textSize="@dimen/text_size_wavegen"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/guideline3"
-        app:layout_constraintEnd_toStartOf="@+id/pwm_mon_sq3"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/pwm_mon_sq1"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/pwm_mon_sq3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:enabled="false"
-        android:text="@string/text_sq3"
-        android:textColor="@drawable/text_color_selector"
-        android:textSize="@dimen/text_size_wavegen"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/guideline3"
-        app:layout_constraintEnd_toStartOf="@+id/pwm_mon_sq4"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/pwm_mon_sq2"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/pwm_mon_sq4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:enabled="false"
-        android:text="@string/text_sq4"
-        android:textColor="@drawable/text_color_selector"
-        android:textSize="@dimen/text_size_wavegen"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/guideline3"
-        app:layout_constraintEnd_toStartOf="@+id/guideline13"
-        app:layout_constraintStart_toEndOf="@+id/pwm_mon_sq3"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <TextView
         android:id="@+id/pwm_freq"
         android:layout_width="wrap_content"
@@ -142,7 +76,7 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/pwm_phase"
         app:layout_constraintStart_toStartOf="@+id/guideline10"
-        app:layout_constraintTop_toTopOf="@+id/guideline3"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
@@ -222,18 +156,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.20"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/guideline3" />
-
-    <View
-        android:layout_width="@dimen/length_0dp"
-        android:layout_height="@dimen/divider_width"
-        android:background="@color/dark_grey"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.20"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.20" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <View
         android:layout_width="@dimen/length_0dp"
diff --git a/app/src/main/res/layout/wave_generator_main_controls.xml b/app/src/main/res/layout/wave_generator_main_controls.xml
index 0abd8ad79..ee9278577 100644
--- a/app/src/main/res/layout/wave_generator_main_controls.xml
+++ b/app/src/main/res/layout/wave_generator_main_controls.xml
@@ -17,22 +17,37 @@
         android:text="@string/produce_sound_text"
         android:textAllCaps="false"
         android:textColor="@color/white"
-        android:textSize="14sp" />
+        android:textSize="@dimen/wave_gen_control_text_size" />
 
     <Button
-        android:id="@+id/pwm_btn_mode"
+        android:id="@+id/analog_mode_btn"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="@dimen/margin_btn"
         android:layout_marginTop="@dimen/margin_btn"
-        android:layout_marginEnd="@dimen/margin_btn"
         android:layout_marginBottom="@dimen/margin_btn"
         android:layout_weight="1"
         android:background="@drawable/btn_back_rounded"
         android:minWidth="@dimen/btn_min_width"
         android:stateListAnimator="@animator/selector_animator"
-        android:text="@string/mode"
+        android:text="@string/text_analog"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="@dimen/wave_gen_control_text_size" />
+    <Button
+        android:id="@+id/digital_mode_btn"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/margin_btn"
+        android:layout_marginTop="@dimen/margin_btn"
+        android:layout_marginEnd="@dimen/margin_btn"
+        android:layout_marginBottom="@dimen/margin_btn"
+        android:layout_weight="1"
+        android:background="@drawable/btn_back_rounded_light"
+        android:minWidth="@dimen/btn_min_width"
+        android:stateListAnimator="@animator/selector_animator"
+        android:text="@string/text_digital"
         android:textAllCaps="false"
         android:textColor="@color/white"
-        android:textSize="14sp" />
+        android:textSize="@dimen/wave_gen_control_text_size" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/wave_generator_seekbar.xml b/app/src/main/res/layout/wave_generator_seekbar.xml
index 38505c270..29b575a5b 100644
--- a/app/src/main/res/layout/wave_generator_seekbar.xml
+++ b/app/src/main/res/layout/wave_generator_seekbar.xml
@@ -11,11 +11,12 @@
         android:id="@+id/img_btn_down"
         android:layout_width="@dimen/length_0dp"
         android:layout_height="wrap_content"
+        android:padding="@dimen/btn_padding"
         android:layout_marginLeft="@dimen/seek_btn_margin"
         android:layout_marginRight="@dimen/seek_btn_margin"
         android:layout_weight="0.1"
         android:background="@drawable/btn_back_rounded"
-        android:src="@drawable/ic_arrow_drop_down_black_24dp"
+        android:src="@drawable/ic_arrow_left_24dp"
         android:stateListAnimator="@animator/selector_animator" />
 
     <com.warkiz.widget.IndicatorSeekBar
@@ -38,11 +39,12 @@
         android:id="@+id/img_btn_up"
         android:layout_width="@dimen/length_0dp"
         android:layout_height="wrap_content"
+        android:padding="@dimen/btn_padding"
         android:layout_marginLeft="@dimen/seek_btn_margin"
         android:layout_marginRight="@dimen/seek_btn_margin"
         android:layout_weight="0.1"
         android:background="@drawable/btn_back_rounded"
-        android:src="@drawable/ic_arrow_drop_up_black_24dp"
+        android:src="@drawable/ic_arrow_right_24dp"
         android:stateListAnimator="@animator/selector_animator" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/wave_generator_wave_controls.xml b/app/src/main/res/layout/wave_generator_wave_controls.xml
index a8b115fe2..a82c3f8cd 100644
--- a/app/src/main/res/layout/wave_generator_wave_controls.xml
+++ b/app/src/main/res/layout/wave_generator_wave_controls.xml
@@ -290,7 +290,7 @@
                 android:layout_height="@dimen/length_0dp"
                 android:layout_marginStart="@dimen/margin_btn"
                 android:layout_marginTop="@dimen/margin_btn"
-                android:background="@drawable/btn_back_rounded"
+                android:background="@drawable/btn_back_rounded_light"
                 android:stateListAnimator="@animator/selector_animator"
                 android:text="@string/text_sq2"
                 android:textColor="@color/white"
@@ -306,7 +306,7 @@
                 android:layout_height="@dimen/length_0dp"
                 android:layout_marginStart="@dimen/margin_btn"
                 android:layout_marginTop="@dimen/margin_btn"
-                android:background="@drawable/btn_back_rounded"
+                android:background="@drawable/btn_back_rounded_light"
                 android:stateListAnimator="@animator/selector_animator"
                 android:text="@string/text_sq3"
                 android:textColor="@color/white"
@@ -323,7 +323,7 @@
                 android:layout_marginStart="@dimen/margin_btn"
                 android:layout_marginTop="@dimen/margin_btn"
                 android:layout_marginEnd="@dimen/margin_btn"
-                android:background="@drawable/btn_back_rounded"
+                android:background="@drawable/btn_back_rounded_light"
                 android:stateListAnimator="@animator/selector_animator"
                 android:text="@string/text_sq4"
                 android:textColor="@color/white"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 117cd1e66..cfd43c4da 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -123,6 +123,8 @@
     <dimen name="multimeter_length_0">0dp</dimen>
     <dimen name="multimeter_knob_width_xhdpi">208dp</dimen>
     <dimen name="multimeter_knob_height_xhdpi">206dp</dimen>
+    <dimen name="wave_gen_control_text_size">14sp</dimen>
+    <dimen name="button_bg_radius">5dp</dimen>
 
     <dimen name="body_resistance_margin">10dp</dimen>