diff --git a/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java b/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java
index a77753da..7d0d62a3 100644
--- a/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java
+++ b/demo/src/main/java/com/flurgle/camerakit/demo/MainActivity.java
@@ -9,9 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.Button;
-import android.widget.CompoundButton;
 import android.widget.EditText;
-import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -24,12 +22,9 @@ import java.io.File;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnCheckedChanged;
 import butterknife.OnClick;
 import butterknife.OnTextChanged;
 
-import static com.flurgle.camerakit.demo.R.id.widthCustom;
-
 public class MainActivity extends AppCompatActivity {
 
     @BindView(R.id.activity_main)
@@ -40,10 +35,13 @@ public class MainActivity extends AppCompatActivity {
 
     // Capture Mode:
 
-    @BindView(R.id.modeCaptureQuality)
-    RadioButton modeQuality;
-    @BindView(R.id.modeCaptureSpeed)
-    RadioButton modeSpeed;
+    @BindView(R.id.captureModeRadioGroup)
+    RadioGroup captureModeRadioGroup;
+
+    // Crop Mode:
+
+    @BindView(R.id.cropModeRadioGroup)
+    RadioGroup cropModeRadioGroup;
 
     // Width:
 
@@ -53,8 +51,8 @@ public class MainActivity extends AppCompatActivity {
     EditText width;
     @BindView(R.id.widthUpdate)
     Button widthUpdate;
-    @BindView(R.id.widthRadioGroup)
-    RadioGroup widthRadioGroup;
+    @BindView(R.id.widthModeRadioGroup)
+    RadioGroup widthModeRadioGroup;
 
     // Height:
 
@@ -64,8 +62,8 @@ public class MainActivity extends AppCompatActivity {
     EditText height;
     @BindView(R.id.heightUpdate)
     Button heightUpdate;
-    @BindView(R.id.heightRadioGroup)
-    RadioGroup heightRadioGroup;
+    @BindView(R.id.heightModeRadioGroup)
+    RadioGroup heightModeRadioGroup;
 
     private int mCameraWidth;
     private int mCameraHeight;
@@ -96,6 +94,9 @@ public class MainActivity extends AppCompatActivity {
                 camera.removeOnLayoutChangeListener(this);
             }
         });
+
+        captureModeRadioGroup.setOnCheckedChangeListener(captureModeChangedListener);
+        cropModeRadioGroup.setOnCheckedChangeListener(cropModeChangedListener);
     }
 
     @Override
@@ -178,14 +179,25 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    @OnCheckedChanged({R.id.modeCaptureQuality, R.id.modeCaptureSpeed})
-    void pictureModeChanged(CompoundButton buttonCompat, boolean checked) {
-        camera.setPictureMode(
-                modeQuality.isChecked() ?
-                        CameraKit.Constants.PICTURE_MODE_QUALITY :
-                        CameraKit.Constants.PICTURE_MODE_SPEED
-        );
-    }
+    RadioGroup.OnCheckedChangeListener captureModeChangedListener = new RadioGroup.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(RadioGroup group, int checkedId) {
+            camera.setPictureMode(
+                    checkedId == R.id.modeCaptureQuality ?
+                            CameraKit.Constants.PICTURE_MODE_QUALITY :
+                            CameraKit.Constants.PICTURE_MODE_SPEED
+            );
+        }
+    };
+
+    RadioGroup.OnCheckedChangeListener cropModeChangedListener = new RadioGroup.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(RadioGroup group, int checkedId) {
+            camera.setCropOutput(
+                    checkedId == R.id.modeCropVisible
+            );
+        }
+    };
 
     @OnTextChanged(value = R.id.width, callback = OnTextChanged.Callback.AFTER_TEXT_CHANGED)
     void widthChanged() {
@@ -203,11 +215,6 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    @OnCheckedChanged({widthCustom, R.id.widthWrapContent, R.id.widthMatchParent})
-    void widthModeChanged(CompoundButton buttonCompat, boolean checked) {
-
-    }
-
     @OnTextChanged(value = R.id.height)
     void heightChanged() {
         if (String.valueOf(mCameraHeight).equals(height.getText().toString())) {
@@ -224,18 +231,13 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    @OnCheckedChanged({R.id.heightCustom, R.id.heightWrapContent, R.id.heightMatchParent})
-    void heightModeChanged() {
-
-    }
-
     private void updateCamera(boolean updateWidth, boolean updateHeight) {
         ViewGroup.LayoutParams cameraLayoutParams = camera.getLayoutParams();
         int width = cameraLayoutParams.width;
         int height = cameraLayoutParams.height;
 
         if (updateWidth) {
-            switch (widthRadioGroup.getCheckedRadioButtonId()) {
+            switch (widthModeRadioGroup.getCheckedRadioButtonId()) {
                 case R.id.widthCustom:
                     String widthInput = this.width.getText().toString();
                     if (widthInput.length() > 0) {
@@ -259,7 +261,7 @@ public class MainActivity extends AppCompatActivity {
         }
 
         if (updateHeight) {
-            switch (heightRadioGroup.getCheckedRadioButtonId()) {
+            switch (heightModeRadioGroup.getCheckedRadioButtonId()) {
                 case R.id.heightCustom:
                     String heightInput = this.height.getText().toString();
                     if (heightInput.length() > 0) {
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index 648042f1..fd8b17b9 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -110,6 +110,7 @@
                         android:textStyle="bold" />
 
                     <RadioGroup
+                        android:id="@+id/captureModeRadioGroup"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -161,6 +162,7 @@
                         android:textStyle="bold" />
 
                     <RadioGroup
+                        android:id="@+id/cropModeRadioGroup"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -309,7 +311,7 @@
                     </FrameLayout>
 
                     <RadioGroup
-                        android:id="@+id/widthRadioGroup"
+                        android:id="@+id/widthModeRadioGroup"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="3dp"
@@ -407,7 +409,7 @@
                     </FrameLayout>
 
                     <RadioGroup
-                        android:id="@+id/heightRadioGroup"
+                        android:id="@+id/heightModeRadioGroup"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="3dp"