diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java b/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
index 64e534d..51a0690 100644
--- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
+++ b/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
@@ -110,14 +110,14 @@ public class MenuProductRecyclerAdapter extends RecyclerView.Adapter<RecyclerVie
             case HOLDER_MENU_PRODUCT :
                 MenuProductViewHolder menuProductViewHolder = (MenuProductViewHolder) holder;
                 ImageLoadHelper.loadImage(menuProductViewHolder.productImageView, menuProductList.get(position).getImageURL());
-                menuProductViewHolder.productNameTextView.setText(menuProductList.get(position).getName());
+                TextHelper.setTextFromHTML(menuProductViewHolder.productNameTextView, menuProductList.get(position).getName());
                 menuProductViewHolder.productPriceTextView.setText(
                         PriceHelper.getPriceWithCurreny(menuProductList.get(position).getPrice()));
                 TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
 
                 if(isDescriptionVisible){
                     menuProductViewHolder.productIngredientsLayout.setVisibility(View.VISIBLE);
-                    menuProductViewHolder.productIngredientsTextView.setText(menuProductList.get(position).getDescription());
+                    TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
                 }
                 else {
                     menuProductViewHolder.productIngredientsLayout.setVisibility(View.GONE);
diff --git a/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java b/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java
index f124647..79629ef 100644
--- a/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java
+++ b/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java
@@ -49,6 +49,7 @@ import retrofit2.Response;
 
 public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragment {
 
+    @BindView(R.id.closeImageView) ImageView closeImageView;
     @BindView(R.id.productImageView) ImageView productImageView;
     @BindView(R.id.productNameTextView) TextView productNameTextView;
     @BindView(R.id.productPriceTextView) TextView productPriceTextView;
@@ -91,11 +92,15 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
         mBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
     }
 
-    @OnClick({R.id.increaseProductCountImageView,
+    @OnClick({R.id.closeImageView,
+            R.id.increaseProductCountImageView,
             R.id.deccreaseProductCountImageView,
             R.id.addToCartButton})
     public void onCLick(View view){
         switch (view.getId()){
+            case R.id.closeImageView:
+                dismiss();
+                break;
             case R.id.increaseProductCountImageView:
                 productCount++;
                 productCountTextView.setText(String.valueOf(productCount));
diff --git a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
index 33ab72d..efb3471 100644
--- a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
@@ -18,6 +18,7 @@ import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Locale;
 
 import butterknife.BindColor;
 import butterknife.BindString;
@@ -189,7 +190,7 @@ public class CartFragment extends BaseFragment {
     }
 
     private void setCartTotalFields(){
-        cartTotalLabelTextView.setText(cartInfoModel.getTotals().get(0).getTitle());
+        cartTotalLabelTextView.setText(cartInfoModel.getTotals().get(0).getTitle().toUpperCase(Locale.GERMAN));
         cartProductTotalTextView.setText(cartInfoModel.getTotals().get(0).getText());
     }
 
diff --git a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java
index 479eb1f..95c5917 100644
--- a/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java
+++ b/app/src/main/java/ch/pizzalink/android/helper/DisplayHelper.java
@@ -17,6 +17,11 @@ public class DisplayHelper {
         return displayMetrics.widthPixels;
     }
 
+    public static int getScreenHeightInPixel(){
+        DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics();
+        return displayMetrics.heightPixels;
+    }
+
     public static int dpToPx(int dp) {
         DisplayMetrics displayMetrics = BaseActivity.currentActivity.getResources().getDisplayMetrics();
         return Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml
index 9188307..c827075 100644
--- a/app/src/main/res/layout/activity_add_address.xml
+++ b/app/src/main/res/layout/activity_add_address.xml
@@ -20,72 +20,100 @@
         app:showBackIcon="true"
         app:titleTextColor="@color/navy" />
 
-    <ScrollView
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
         android:layout_below="@+id/addAddressToolbar">
 
-        <LinearLayout
+        <ImageView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:background="@color/white">
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@drawable/background_wood" />
 
-            <ch.pizzalink.android.view.PizzalinkEditText
-                android:id="@+id/address1PizzalinkEditText"
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            app:cardCornerRadius="4dp"
+            android:layout_margin="12dp">
+
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:edittextTheme="navy"
-                app:inputType="address"
-                app:hint="@string/addres_line_1"/>
+                android:layout_height="match_parent">
 
-            <ch.pizzalink.android.view.PizzalinkDropdownView
-                android:id="@+id/cityPizzalinkDropdown"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dropdownTheme="navy"
-                app:dropdownHintView="@string/city"/>
+                <ScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_above="@+id/addNewAddressButton">
 
-            <ch.pizzalink.android.view.PizzalinkDropdownView
-                android:id="@+id/postcodePizzalinkDrowpdown"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dropdownTheme="navy"
-                app:dropdownHintView="@string/postcode"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:background="@color/white">
 
-            <ch.pizzalink.android.view.PizzalinkDropdownView
-                android:id="@+id/countryPizzalinkDropdown"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dropdownTheme="navy"
-                app:dropdownHintView="@string/country"/>
+                        <ch.pizzalink.android.view.PizzalinkEditText
+                            android:id="@+id/address1PizzalinkEditText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:edittextTheme="navy"
+                            app:inputType="address"
+                            app:hint="@string/addres_line_1"/>
 
-            <ch.pizzalink.android.view.PizzalinkDropdownView
-                android:id="@+id/zonePizzalinkDropdown"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:dropdownTheme="navy"
-                app:dropdownHintView="@string/zone"/>
+                        <ch.pizzalink.android.view.PizzalinkDropdownView
+                            android:id="@+id/cityPizzalinkDropdown"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:dropdownTheme="navy"
+                            app:dropdownHintView="@string/city"/>
 
-            <android.support.v4.widget.Space
-                android:layout_width="match_parent"
-                android:layout_height="48dp" />
+                        <ch.pizzalink.android.view.PizzalinkDropdownView
+                            android:id="@+id/postcodePizzalinkDrowpdown"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:dropdownTheme="navy"
+                            app:dropdownHintView="@string/postcode"/>
 
-        </LinearLayout>
+                        <ch.pizzalink.android.view.PizzalinkDropdownView
+                            android:id="@+id/countryPizzalinkDropdown"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:dropdownTheme="navy"
+                            app:dropdownHintView="@string/country"/>
 
-    </ScrollView>
+                        <ch.pizzalink.android.view.PizzalinkDropdownView
+                            android:id="@+id/zonePizzalinkDropdown"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:dropdownTheme="navy"
+                            app:dropdownHintView="@string/zone"/>
 
-    <Button
-        android:id="@+id/addNewAddressButton"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        style="@style/PizzalinkRedButton"
-        android:text="@string/add"
-        android:layout_alignParentBottom="true" />
+                        <android.support.v4.widget.Space
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp" />
+
+                    </LinearLayout>
+
+                </ScrollView>
+
+                <Button
+                    android:id="@+id/addNewAddressButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    style="@style/PizzalinkRedButton"
+                    android:text="@string/add"
+                    android:layout_alignParentBottom="true" />
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+
+    </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_create_order.xml b/app/src/main/res/layout/activity_create_order.xml
index 77a80ee..18b5385 100644
--- a/app/src/main/res/layout/activity_create_order.xml
+++ b/app/src/main/res/layout/activity_create_order.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<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:background="@color/white"
-    android:orientation="vertical"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
     tools:context="ch.pizzalink.android.activity.CreateOrderActivity">
 
     <ch.pizzalink.android.view.PizzalinkToolbar
@@ -18,30 +19,62 @@
         app:showBackIcon="true"
         app:titleTextColor="@color/navy" />
 
-    <LinearLayout
-        android:id="@+id/stepIndicatorLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <com.badoualy.stepperindicator.StepperIndicator
-            android:id="@+id/stepperIndicator"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            app:stpi_labels="@array/stepperLabels" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@drawable/shadow"/>
-
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/orderFragmentsContainer"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/actvity_default_background_color_1" />
+        android:layout_below="@+id/orderToolbar">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@drawable/background_wood" />
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            app:cardCornerRadius="4dp"
+            android:layout_margin="12dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:orientation="vertical"
+                tools:context="ch.pizzalink.android.activity.CreateOrderActivity">
+
+                <LinearLayout
+                    android:id="@+id/stepIndicatorLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <com.badoualy.stepperindicator.StepperIndicator
+                        android:id="@+id/stepperIndicator"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="16dp"
+                        app:stpi_labels="@array/stepperLabels" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@drawable/shadow"/>
+
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/orderFragmentsContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/actvity_default_background_color_1" />
+
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+    </RelativeLayout>
+
+</RelativeLayout>
 
-</LinearLayout>
diff --git a/app/src/main/res/layout/activity_my_addresses.xml b/app/src/main/res/layout/activity_my_addresses.xml
index 94441fc..0b46cb9 100644
--- a/app/src/main/res/layout/activity_my_addresses.xml
+++ b/app/src/main/res/layout/activity_my_addresses.xml
@@ -17,21 +17,48 @@
         app:showBackIcon="true"
         app:titleTextColor="@color/navy" />
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/myAddressesRecyclerView"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/myAddressesToolbar"
-        android:layout_above="@+id/addNewAddressButton"/>
+        android:layout_below="@+id/myAddressesToolbar">
 
-    <Button
-        android:id="@+id/addNewAddressButton"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        style="@style/PizzalinkRedButton"
-        android:text="@string/add_new_address"
-        android:layout_alignParentBottom="true"/>
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@drawable/background_wood" />
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            app:cardCornerRadius="4dp"
+            android:layout_margin="12dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/myAddressesRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_above="@+id/addNewAddressButton"/>
+
+                <Button
+                    android:id="@+id/addNewAddressButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    style="@style/PizzalinkRedButton"
+                    android:text="@string/add_new_address"
+                    android:layout_alignParentBottom="true"/>
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+
+    </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_update_password.xml b/app/src/main/res/layout/activity_update_password.xml
index 161fdeb..295bd59 100644
--- a/app/src/main/res/layout/activity_update_password.xml
+++ b/app/src/main/res/layout/activity_update_password.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<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:background="@color/white"
-    android:orientation="vertical"
     android:focusable="true"
     android:focusableInTouchMode="true"
     tools:context="ch.pizzalink.android.activity.UpdatePasswordActivity">
@@ -20,41 +19,71 @@
         app:showBackIcon="true"
         app:titleTextColor="@color/navy" />
 
-    <ch.pizzalink.android.view.PizzalinkEditText
-        android:id="@+id/oldPasswordPizzalinkEditText"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:edittextTheme="navy"
-        app:inputType="password"
-        app:hint="@string/hint_old_password"/>
+        android:layout_height="match_parent"
+        android:layout_below="@+id/updatePasswordToolbar">
 
-    <ch.pizzalink.android.view.PizzalinkEditText
-        android:id="@+id/newPasswordPizzalinkEditText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:edittextTheme="navy"
-        app:inputType="password"
-        app:hint="@string/hint_new_password"/>
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@drawable/background_wood" />
 
-    <ch.pizzalink.android.view.PizzalinkEditText
-        android:id="@+id/confirmNewPasswordPizzalinkEditText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:inputType="password"
-        app:edittextTheme="navy"
-        app:hint="@string/hint_confirm_new_password"/>
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            app:cardCornerRadius="4dp"
+            android:layout_margin="12dp">
 
-    <android.support.v4.widget.Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-    <Button
-        android:id="@+id/updatePasswordButton"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        style="@style/PizzalinkRedButton"
-        android:text="@string/update_app" />
+                <ch.pizzalink.android.view.PizzalinkEditText
+                    android:id="@+id/oldPasswordPizzalinkEditText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:edittextTheme="navy"
+                    app:inputType="password"
+                    app:hint="@string/hint_old_password"/>
+
+                <ch.pizzalink.android.view.PizzalinkEditText
+                    android:id="@+id/newPasswordPizzalinkEditText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:edittextTheme="navy"
+                    app:inputType="password"
+                    app:hint="@string/hint_new_password"/>
+
+                <ch.pizzalink.android.view.PizzalinkEditText
+                    android:id="@+id/confirmNewPasswordPizzalinkEditText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:inputType="password"
+                    app:edittextTheme="navy"
+                    app:hint="@string/hint_confirm_new_password"/>
+
+                <android.support.v4.widget.Space
+                    android:layout_width="match_parent"
+                    android:layout_height="16dp" />
+
+                <Button
+                    android:id="@+id/updatePasswordButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    style="@style/PizzalinkRedButton"
+                    android:text="@string/update_app" />
+
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+    </RelativeLayout>
+
+</RelativeLayout>
 
-</LinearLayout>
diff --git a/app/src/main/res/layout/activity_update_profile.xml b/app/src/main/res/layout/activity_update_profile.xml
index 548ddf0..9665ff9 100644
--- a/app/src/main/res/layout/activity_update_profile.xml
+++ b/app/src/main/res/layout/activity_update_profile.xml
@@ -19,55 +19,82 @@
         app:showBackIcon="true"
         app:titleTextColor="@color/navy" />
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_below="@+id/updateProfileToolbar"
-        android:layout_above="@+id/updateProfileButton">
+        android:layout_height="match_parent"
+        android:layout_below="@+id/updateProfileToolbar">
 
-        <ch.pizzalink.android.view.PizzalinkEditText
-            android:id="@+id/firstnamePizzalinkEditText"
+        <ImageView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:edittextTheme="navy"
-            app:inputType="name"
-            app:hint="@string/firstname"/>
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@drawable/background_wood" />
 
-        <ch.pizzalink.android.view.PizzalinkEditText
-            android:id="@+id/lasstnamePizzalinkEditText"
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:edittextTheme="navy"
-            app:inputType="name"
-            app:hint="@string/lastname"/>
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            app:cardCornerRadius="4dp"
+            android:layout_margin="12dp">
 
-        <ch.pizzalink.android.view.PizzalinkEditText
-            android:id="@+id/telephonePizzalinkEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:edittextTheme="navy"
-            app:hint="@string/telephone"
-            app:inputType="phone"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
-        <ch.pizzalink.android.view.PizzalinkEditText
-            android:id="@+id/emailPizzalinkEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:edittextTheme="navy"
-            app:hint="@string/email"
-            app:inputType="email"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:layout_above="@+id/updateProfileButton">
 
-    </LinearLayout>
+                    <ch.pizzalink.android.view.PizzalinkEditText
+                        android:id="@+id/firstnamePizzalinkEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:edittextTheme="navy"
+                        app:inputType="name"
+                        app:hint="@string/firstname"/>
 
-    <Button
-        android:id="@+id/updateProfileButton"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        style="@style/PizzalinkRedButton"
-        android:text="@string/update_app"
-        android:layout_alignParentBottom="true" />
+                    <ch.pizzalink.android.view.PizzalinkEditText
+                        android:id="@+id/lasstnamePizzalinkEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:edittextTheme="navy"
+                        app:inputType="name"
+                        app:hint="@string/lastname"/>
+
+                    <ch.pizzalink.android.view.PizzalinkEditText
+                        android:id="@+id/telephonePizzalinkEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:edittextTheme="navy"
+                        app:hint="@string/telephone"
+                        app:inputType="phone"/>
+
+                    <ch.pizzalink.android.view.PizzalinkEditText
+                        android:id="@+id/emailPizzalinkEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:edittextTheme="navy"
+                        app:hint="@string/email"
+                        app:inputType="email"/>
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/updateProfileButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    style="@style/PizzalinkRedButton"
+                    android:text="@string/update_app"
+                    android:layout_alignParentBottom="true" />
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+
+    </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml
index 4a0539b..57c18cd 100644
--- a/app/src/main/res/layout/fragment_cart.xml
+++ b/app/src/main/res/layout/fragment_cart.xml
@@ -65,8 +65,8 @@
                 android:id="@+id/cartTotalLabelTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAllCaps="true"
                 android:textColor="@color/navy"
+                fontPath="fonts/Quicksand-Bold.ttf"
                 android:layout_gravity="center_horizontal"
                 android:text="TOTAL"/>
 
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 545d12b..7e057ab 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -1,182 +1,218 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+
+<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"
+    tools:ignore="MissingPrefix"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_alignParentTop="true"
-    android:layout_alignParentLeft="true"
-    android:layout_alignParentStart="true"
-    android:background="@color/white">
+    android:layout_height="match_parent">
 
-    <LinearLayout
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/background_wood" />
 
-        <ch.pizzalink.android.view.PizzalinkInfoView
-            android:id="@+id/firstnamePizzalinkInfoLayout"
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        app:cardCornerRadius="4dp"
+        android:layout_margin="12dp">
+
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:description="@string/profile_firstname" />
+            android:layout_height="match_parent"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:background="@color/white">
 
-        <ch.pizzalink.android.view.PizzalinkInfoView
-            android:id="@+id/lastnamePizzalinkInfoLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:description="@string/profile_lastname" />
-
-        <ch.pizzalink.android.view.PizzalinkInfoView
-            android:id="@+id/emailPizzalinkInfoLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:description="@string/profile_email" />
-
-        <ch.pizzalink.android.view.PizzalinkInfoView
-            android:id="@+id/phonePizzalinkInfoLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:description="@string/profile_telephone" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@drawable/shadow"/>
-
-        <RelativeLayout
-            android:id="@+id/myAddressesLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp">
-
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/my_addresses"
-                android:layout_marginTop="4dp"
-                android:textColor="@color/navy"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@+id/arrow1"
-                android:layout_toStartOf="@+id/arrow1"/>
+                android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/arrow1"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_back"
-                android:tint="@color/venus"
-                android:padding="6dp"
-                android:rotation="180"/>
+                <ch.pizzalink.android.view.PizzalinkInfoView
+                    android:id="@+id/firstnamePizzalinkInfoLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/profile_firstname" />
 
-        </RelativeLayout>
+                <ch.pizzalink.android.view.PizzalinkInfoView
+                    android:id="@+id/lastnamePizzalinkInfoLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/profile_lastname" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@drawable/shadow"/>
+                <ch.pizzalink.android.view.PizzalinkInfoView
+                    android:id="@+id/emailPizzalinkInfoLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/profile_email" />
 
-        <RelativeLayout
-            android:id="@+id/updateProfileLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp">
+                <ch.pizzalink.android.view.PizzalinkInfoView
+                    android:id="@+id/phonePizzalinkInfoLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/profile_telephone" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/update_profile"
-                android:layout_marginTop="4dp"
-                android:textColor="@color/navy"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@+id/arrow2"
-                android:layout_toStartOf="@+id/arrow2"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@color/navy"/>
 
-            <ImageView
-                android:id="@+id/arrow2"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_back"
-                android:tint="@color/venus"
-                android:padding="6dp"
-                android:rotation="180"/>
+                <RelativeLayout
+                    android:id="@+id/myAddressesLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp">
 
-        </RelativeLayout>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/my_addresses"
+                        android:layout_marginTop="4dp"
+                        android:textColor="@color/navy"
+                        fontPath="fonts/Quicksand-Bold.ttf"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_toLeftOf="@+id/arrow1"
+                        android:layout_toStartOf="@+id/arrow1"/>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@drawable/shadow"/>
+                    <ImageView
+                        android:id="@+id/arrow1"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_back"
+                        android:tint="@color/navy"
+                        android:padding="6dp"
+                        android:rotation="180"/>
+
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@color/navy"/>
+
+                <RelativeLayout
+                    android:id="@+id/updateProfileLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/update_profile"
+                        fontPath="fonts/Quicksand-Bold.ttf"
+                        android:textColor="@color/navy"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true" />
+
+                    <ImageView
+                        android:id="@+id/arrow2"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_back"
+                        android:tint="@color/navy"
+                        android:padding="6dp"
+                        android:rotation="180"/>
+
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@color/navy"/>
+
+                <RelativeLayout
+                    android:id="@+id/updatePasswordLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/update_password"
+                        android:layout_marginTop="4dp"
+                        fontPath="fonts/Quicksand-Bold.ttf"
+                        android:textColor="@color/navy"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_toLeftOf="@+id/arrow3"
+                        android:layout_toStartOf="@+id/arrow3"/>
+
+                    <ImageView
+                        android:id="@+id/arrow3"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_back"
+                        android:tint="@color/navy"
+                        android:padding="6dp"
+                        android:rotation="180"/>
+
+                </RelativeLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@color/navy"/>
+
+                <RelativeLayout
+                    android:id="@+id/logoutLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/button_logout"
+                        fontPath="fonts/Quicksand-Bold.ttf"
+                        android:layout_marginTop="4dp"
+                        android:textColor="@color/navy"
+                        android:layout_centerVertical="true" />
+
+                </RelativeLayout>
 
 
-        <RelativeLayout
-            android:id="@+id/updatePasswordLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp">
+            </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/update_password"
-                android:layout_marginTop="4dp"
-                android:textColor="@color/navy"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@+id/arrow3"
-                android:layout_toStartOf="@+id/arrow3"/>
+        </ScrollView>
 
-            <ImageView
-                android:id="@+id/arrow3"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_back"
-                android:tint="@color/venus"
-                android:padding="6dp"
-                android:rotation="180"/>
+    </android.support.v7.widget.CardView>
 
-        </RelativeLayout>
+</RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@drawable/shadow"/>
-
-        <RelativeLayout
-            android:id="@+id/logoutLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/button_logout"
-                android:layout_marginTop="4dp"
-                android:textColor="@color/navy"
-                android:layout_centerVertical="true" />
-
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@drawable/shadow"/>
-
-
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_store_info.xml b/app/src/main/res/layout/fragment_store_info.xml
index 507c199..120cea2 100644
--- a/app/src/main/res/layout/fragment_store_info.xml
+++ b/app/src/main/res/layout/fragment_store_info.xml
@@ -1,14 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
+    android:layout_height="match_parent">
 
-    <WebView
-        android:id="@+id/storeInfoWebView"
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/background_wood" />
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            app:cardCornerRadius="4dp"
+            android:layout_margin="12dp">
+
+            <WebView
+                android:id="@+id/storeInfoWebView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="12dp"/>
+
+        </android.support.v7.widget.CardView>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_bottomsheet.xml b/app/src/main/res/layout/layout_bottomsheet.xml
index 0081874..d5be8e9 100644
--- a/app/src/main/res/layout/layout_bottomsheet.xml
+++ b/app/src/main/res/layout/layout_bottomsheet.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingPrefix"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white">
 
@@ -15,35 +15,44 @@
         android:src="@drawable/ic_back"
         android:visibility="gone"/>
 
-    <RelativeLayout
+    <!-- android:background="@color/cart_dialog_background" -->
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/cart_dialog_background">
+        android:orientation="vertical"
+        android:background="@color/white">
 
         <ImageView
-            android:id="@+id/productImageView"
-            android:layout_width="144dp"
-            android:layout_height="144dp"
-            android:layout_marginTop="-48dp"
-            android:layout_marginBottom="36dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginRight="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_gravity="center_horizontal" />
+            android:id="@+id/closeImageView"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/ic_cancel"
+            android:layout_gravity="right|end"
+            android:padding="12dp"/>
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginRight="12dp"
-            android:layout_toRightOf="@+id/productImageView"
-            android:layout_toEndOf="@+id/productImageView">
+            android:layout_height="wrap_content">
 
-            <RelativeLayout
+            <ImageView
+                android:id="@+id/productImageView"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_gravity="center_horizontal" />
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="@drawable/background_cart_dialog_price">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginRight="12dp"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="12dp"
+                android:layout_toRightOf="@+id/productImageView"
+                android:layout_toEndOf="@+id/productImageView">
 
                 <TextView
                     android:id="@+id/productNameTextView"
@@ -51,18 +60,11 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/navy"
                     android:textSize="18sp"
+                    android:padding="12sp"
                     android:text="Pizza Formaggio"
                     fontPath="fonts/Quicksand-Bold.ttf"
                     android:layout_gravity="center"
-                    android:gravity="center"
-                    android:layout_centerVertical="true"/>
-
-            </RelativeLayout>
-
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="48dp">
+                    android:gravity="center" />
 
                 <TextView
                     android:id="@+id/productPriceTextView"
@@ -70,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/red"
                     android:text="CHF 25.00"
-                    android:textSize="16sp"
+                    android:textSize="18sp"
                     android:paddingBottom="12dp"
                     android:paddingLeft="12dp"
                     android:paddingStart="12dp"
@@ -78,22 +80,22 @@
                     android:paddingEnd="12dp"
                     fontPath="fonts/Quicksand-Bold.ttf"
                     android:layout_gravity="center"
-                    android:gravity="center"
-                    android:layout_centerVertical="true"/>
+                    android:gravity="center" />
 
-            </RelativeLayout>
+            </LinearLayout>
 
-        </LinearLayout>
+        </RelativeLayout>
 
-    </RelativeLayout>
+        <Button
+            android:id="@+id/addToCartButton"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:text="@string/add_to_cart"
+            style="@style/PizzalinkRedButton"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"/>
 
-    <Button
-        android:id="@+id/addToCartButton"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="-24dp"
-        android:text="@string/add_to_cart"
-        style="@style/PizzalinkRedButton" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_pizzalink_view.xml b/app/src/main/res/layout/layout_pizzalink_view.xml
index 70350a3..f1c2f02 100644
--- a/app/src/main/res/layout/layout_pizzalink_view.xml
+++ b/app/src/main/res/layout/layout_pizzalink_view.xml
@@ -13,17 +13,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/order_person_fullname"
-        android:textColor="@color/heater"
+        android:textColor="@color/navy"
         android:textSize="12sp"
         fontPath="fonts/Quicksand-Bold.ttf" />
 
     <TextView
         android:id="@+id/infoTextView"
+        fontPath="fonts/Quicksand-Bold.ttf"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Aytaç Cici"
         android:layout_marginTop="4dp"
-        fontPath="fonts/Quicksand-Bold.ttf"
-        android:textColor="@color/navy"/>
+        android:text="Aytaç Cici"
+        android:textColor="@color/red" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_menu_product.xml b/app/src/main/res/layout/row_menu_product.xml
index 336a7ad..2dc4958 100644
--- a/app/src/main/res/layout/row_menu_product.xml
+++ b/app/src/main/res/layout/row_menu_product.xml
@@ -28,6 +28,7 @@
 
     </RelativeLayout>
 
+    <!-- android:background="@color/transparent_white" -->
     <ImageView
         android:id="@+id/productImageView"
         android:layout_width="160dp"
@@ -37,7 +38,7 @@
         android:layout_marginLeft="12dp"
         android:layout_marginRight="12dp"
         android:layout_marginStart="12dp"
-        android:background="@color/transparent_white"/>
+        android:background="@color/white"/>
 
     <RelativeLayout
         android:id="@+id/productIngredientsLayout"
diff --git a/app/src/main/res/layout/row_my_address.xml b/app/src/main/res/layout/row_my_address.xml
index 61d571d..91943e7 100644
--- a/app/src/main/res/layout/row_my_address.xml
+++ b/app/src/main/res/layout/row_my_address.xml
@@ -1,33 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingPrefix"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
-    android:padding="12dp">
+    android:orientation="vertical"
+    android:background="@color/white">
 
-    <TextView
-        android:id="@+id/addressTextView"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="48dp"
-        android:layout_marginEnd="24dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_toLeftOf="@+id/deleteAddressImageView"
-        android:layout_toStartOf="@+id/deleteAddressImageView"
-        android:layout_centerVertical="true"
-        android:textColor="@color/navy" />
+        android:padding="16dp">
 
-    <ImageView
-        android:id="@+id/deleteAddressImageView"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:padding="8dp"
-        android:src="@drawable/ic_cancel_2"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
+        <TextView
+            android:id="@+id/addressTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="48dp"
+            android:layout_marginEnd="24dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_toLeftOf="@+id/deleteAddressImageView"
+            android:layout_toStartOf="@+id/deleteAddressImageView"
+            android:layout_centerVertical="true"
+            android:text="Test Address"
+            fontPath="fonts/Quicksand-Bold.ttf"
+            android:textColor="@color/navy" />
 
-</RelativeLayout>
\ No newline at end of file
+        <ImageView
+            android:id="@+id/deleteAddressImageView"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:padding="8dp"
+            android:src="@drawable/ic_cancel_2"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"/>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@color/navy"/>
+
+</LinearLayout>