diff --git a/app/src/main/res/layout/activity_create_config.xml b/app/src/main/res/layout/activity_create_config.xml
index b10d9e430..d07f51076 100644
--- a/app/src/main/res/layout/activity_create_config.xml
+++ b/app/src/main/res/layout/activity_create_config.xml
@@ -18,66 +18,85 @@
             android:orientation="vertical"
             android:padding="@dimen/config_activity_padding">
 
-            <LinearLayout
-                android:id="@+id/select_instrument"
+            <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/height_zero"
-                android:layout_weight="@dimen/weight_one"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/select_instrument_title"
-                    style="@style/Base.TextAppearance.AppCompat.Title"
-                    android:layout_width="@dimen/width_zero"
-                    android:layout_weight="@dimen/weight_one"
-                    android:textSize="@dimen/text_size_of_label"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/select_instrument_title" />
-
-                <android.support.v7.widget.AppCompatSpinner
-                    android:id="@+id/select_instrument_spinner"
-                    android:layout_width="@dimen/width_zero"
-                    android:layout_weight="@dimen/weight_two"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/card_margin"
+                android:padding="@dimen/card_margin"
+                app:cardCornerRadius="@dimen/accel_card_radius"
+                app:cardElevation="@dimen/card_elevation">
+
+                <LinearLayout
+                    android:id="@+id/select_instrument"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:textAlignment="center" />
-            </LinearLayout>
-
-            <LinearLayout
+                    android:paddingTop="@dimen/create_config_padding"
+                    android:paddingBottom="@dimen/create_config_padding"
+                    android:layout_marginStart="@dimen/create_config_margin1">
+
+                    <TextView
+                        android:id="@+id/select_instrument_title"
+                        style="@style/Base.TextAppearance.AppCompat.Title"
+                        android:layout_width="@dimen/width_zero"
+                        android:layout_weight="@dimen/weight_one"
+                        android:textSize="@dimen/text_size_of_label"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/select_instrument_title" />
+
+                    <android.support.v7.widget.AppCompatSpinner
+                        android:id="@+id/select_instrument_spinner"
+                        android:layout_width="@dimen/width_zero"
+                        android:layout_weight="@dimen/weight_two"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textAlignment="center" />
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/height_zero"
-                android:layout_weight="@dimen/weight_one"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/card_margin"
                 android:layout_marginTop="@dimen/create_config_margin1"
-                android:orientation="horizontal">
+                app:cardCornerRadius="@dimen/accel_card_radius"
+                app:cardElevation="@dimen/card_elevation">
 
-                <TextView
-                    android:id="@+id/time_interval_title"
-                    style="@style/Base.TextAppearance.AppCompat.Title"
-                    android:layout_width="wrap_content"
-                    android:textSize="@dimen/text_size_of_label"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/time_interval_title" />
-
-                <EditText
-                    android:id="@+id/interval_edit_text"
-                    android:layout_width="@dimen/width_zero"
-                    android:layout_weight="@dimen/weight_three"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/time_interval_hint"
-                    android:imeOptions="actionDone"
-                    android:inputType="number"
-                    android:textAlignment="center"
-                    android:layout_gravity="center"/>
-
-                <android.support.v7.widget.AppCompatSpinner
-                    android:id="@+id/interval_unit_spinner"
-                    android:layout_width="@dimen/width_zero"
-                    android:layout_weight="@dimen/weight_one"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"/>
-            </LinearLayout>
+                    android:orientation="horizontal"
+                    android:layout_marginStart="@dimen/create_config_margin1">
+
+                    <TextView
+                        android:id="@+id/time_interval_title"
+                        style="@style/Base.TextAppearance.AppCompat.Title"
+                        android:layout_width="wrap_content"
+                        android:textSize="@dimen/text_size_of_label"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/time_interval_title" />
+
+                    <EditText
+                        android:id="@+id/interval_edit_text"
+                        android:layout_width="@dimen/width_zero"
+                        android:layout_weight="@dimen/weight_three"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/time_interval_hint"
+                        android:imeOptions="actionDone"
+                        android:inputType="number"
+                        android:textAlignment="center"
+                        android:layout_gravity="center" />
+
+                    <android.support.v7.widget.AppCompatSpinner
+                        android:id="@+id/interval_unit_spinner"
+                        android:layout_width="@dimen/width_zero"
+                        android:layout_weight="@dimen/weight_one"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center" />
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
 
             <TextView
                 android:id="@+id/select_params_title"
@@ -93,8 +112,7 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/params_list_container"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/height_zero"
-                android:layout_weight="@dimen/weight_four"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/create_config_margin1" />
 
             <Button
diff --git a/app/src/main/res/layout/item_checkbox.xml b/app/src/main/res/layout/item_checkbox.xml
index d17c3b22c..7539b67bc 100644
--- a/app/src/main/res/layout/item_checkbox.xml
+++ b/app/src/main/res/layout/item_checkbox.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/check_box_magin"
+    android:layout_margin="@dimen/check_box_margin"
     app:cardCornerRadius="@dimen/check_box_corner">
 
     <LinearLayout
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index cf20b6211..013a5a1fd 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -376,8 +376,9 @@
     <dimen name="create_config_margin3">22dp</dimen>
     <dimen name="create_config_margin4">12dp</dimen>
     <dimen name="create_config_recycler_view">280dp</dimen>
+    <dimen name="create_config_padding">6dp</dimen>
     <dimen name="check_box_width">0dp</dimen>
-    <dimen name="check_box_magin">5dp</dimen>
+    <dimen name="check_box_margin">5dp</dimen>
     <dimen name="check_box_corner">5dp</dimen>
     <dimen name="sensor_sht21_margin">5dp</dimen>
     <dimen name="sht21_height">40dp</dimen>