diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 99fd413..ad57be1 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 6d4674b..5f28864 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,7 @@ android {
         versionCode 11  // play store'daki version --> canlı: 8 - dahili test: 10
         versionName "2.13"   // play store'daki version --> canlı: 2.1 -  dahili test: 2.12
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -37,6 +38,7 @@ dependencies {
     implementation 'com.android.support:support-v13:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:multidex:1.0.3'
 
     implementation 'com.google.android.gms:play-services-base:15.0.1'
     implementation 'com.google.android.gms:play-services-location:15.0.1'
@@ -72,5 +74,6 @@ dependencies {
         transitive = true;
     }
 
+    api 'com.google.guava:guava:26.0-android'
     testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/ch/pizzapp/android/App.java b/app/src/main/java/ch/pizzapp/android/App.java
index ea4e620..3e46076 100644
--- a/app/src/main/java/ch/pizzapp/android/App.java
+++ b/app/src/main/java/ch/pizzapp/android/App.java
@@ -1,6 +1,7 @@
 package ch.pizzapp.android;
 
 import android.app.Application;
+import android.support.multidex.MultiDexApplication;
 
 import com.crashlytics.android.Crashlytics;
 import com.jakewharton.picasso.OkHttp3Downloader;
@@ -13,7 +14,7 @@ import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
  * Created by cimenmus on 11/09/2017.
  */
 
-public class App extends Application {
+public class App extends MultiDexApplication {
 
     @Override
     public void onCreate() {
diff --git a/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java b/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java
index dcb5021..ea23494 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java
@@ -293,7 +293,7 @@ public class AddAddressActivity extends BaseActivity {
     private void addNewAddress(){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<AddNewAddressResponseModel>> call = ApiService.apiInterface.addNewAddress(
-                ApiEndPoints.API_ADD_NEW_ADDRESS + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_ADD_NEW_ADDRESS + SessionHelper.getCustomerToken().getToken(),
                 getAddNewAddressRequestParams());
         call.enqueue(new Callback<ResponseObject<AddNewAddressResponseModel>>() {
             @Override
diff --git a/app/src/main/java/ch/pizzapp/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzapp/android/activity/CampaignProductDetailsActivity.java
index 52d9d3f..f188496 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/CampaignProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/CampaignProductDetailsActivity.java
@@ -262,7 +262,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<AddProductToBasketResponseModel>> call =
                 ApiService.apiInterface.addProductsToBasket(
-                        ApiEndPoints.API_ADD_PRODUCTS_TO_BASKET + SessionHelper.getCustomerToken().getToken(),
+                        "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_ADD_PRODUCTS_TO_BASKET + SessionHelper.getCustomerToken().getToken(),
                         getAddToCartRequestParams());
         call.enqueue(new Callback<ResponseObject<AddProductToBasketResponseModel>>() {
             @Override
@@ -322,7 +322,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
 
     private void getCartItemCount(){
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
diff --git a/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java
index 23e999a..483801c 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java
@@ -123,7 +123,7 @@ public class LoginActivity extends BaseActivity {
 
     private void getCartItemCount(){
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
diff --git a/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java b/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java
index c18e4ad..5164550 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java
@@ -134,7 +134,7 @@ public class MyAddressesActivity extends BaseActivity {
     private void deleteAddress(final int position){
         DialogHelper.hideLoadingDialog();
         Call<ResponseObject<DeleteAddressResponseModel>> call = ApiService.apiInterface.deleteAddress(
-                ApiEndPoints.API_DELETE_ADDRESS + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_DELETE_ADDRESS + SessionHelper.getCustomerToken().getToken(),
                 addressList.get(position).getId());
         call.enqueue(new Callback<ResponseObject<DeleteAddressResponseModel>>() {
             @Override
diff --git a/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java b/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java
index e8cd2af..b283b3f 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java
@@ -118,7 +118,7 @@ public class OrderHistoryDetailsActivity extends BaseActivity {
     private void getOrderProductList(){
         DialogHelper.showLoadingDialog();
         Call<ResponseArray<OrderHistoryProductModel>> call = ApiService.apiInterface.getOrderProductList(
-                        ApiEndPoints.API_GET_ORDER_PRODUCT_LIST + SessionHelper.getCustomerToken().getToken(), orderHistoryModel.getId());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_ORDER_PRODUCT_LIST + SessionHelper.getCustomerToken().getToken(), orderHistoryModel.getId());
         call.enqueue(new Callback<ResponseArray<OrderHistoryProductModel>>() {
             @Override
             public void onResponse(Call<ResponseArray<OrderHistoryProductModel>> call, Response<ResponseArray<OrderHistoryProductModel>> response) {
@@ -236,7 +236,7 @@ public class OrderHistoryDetailsActivity extends BaseActivity {
         params.put("order_id", orderHistoryModel.getId());
 
         Call<ResponseObject> call = ApiService.apiInterface.repeatOrder(
-                ApiEndPoints.API_REPEAT_ORDER + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_REPEAT_ORDER + SessionHelper.getCustomerToken().getToken(),
                 params);
         call.enqueue(new Callback<ResponseObject>() {
             @Override
diff --git a/app/src/main/java/ch/pizzapp/android/activity/ProductDetailsActivity.java b/app/src/main/java/ch/pizzapp/android/activity/ProductDetailsActivity.java
index 509de53..7c30c8f 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/ProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/ProductDetailsActivity.java
@@ -269,7 +269,7 @@ public class ProductDetailsActivity extends BaseActivity {
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<AddProductToBasketResponseModel>> call =
                 ApiService.apiInterface.addProductsToBasket(
-                        ApiEndPoints.API_ADD_PRODUCTS_TO_BASKET + SessionHelper.getCustomerToken().getToken(),
+                        "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_ADD_PRODUCTS_TO_BASKET + SessionHelper.getCustomerToken().getToken(),
                         getAddToCartRequestParams());
         call.enqueue(new Callback<ResponseObject<AddProductToBasketResponseModel>>() {
             @Override
@@ -329,7 +329,7 @@ public class ProductDetailsActivity extends BaseActivity {
 
     private void getCartItemCount(){
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
diff --git a/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java
index 7f91766..d29c0b6 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java
@@ -99,7 +99,8 @@ public class SplashActivity extends BaseActivity {
             @Override
             public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) {
                 StoreModel selectedStoreModel = storeList.get(position);
-                SharedPrefsHelper.saveSelectedStore(selectedStoreModel);
+                SessionHelper.setSelectedStore(selectedStoreModel);
+                ApiService.getInstance().reset();
                 checkVersion();
             }
         });
@@ -282,7 +283,7 @@ public class SplashActivity extends BaseActivity {
 
     private void getCartItemCount(){
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
diff --git a/app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java b/app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java
index 0dd1747..1b8915f 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java
@@ -70,7 +70,7 @@ public class UpdatePasswordActivity extends BaseActivity {
     private void updatePassword(){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject> call = ApiService.apiInterface.updatePassword(
-                ApiEndPoints.API_UPDATE_PASSWORD + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_UPDATE_PASSWORD + SessionHelper.getCustomerToken().getToken(),
                 getUpdatePasswordRequestParams());
         call.enqueue(new Callback<ResponseObject>() {
             @Override
diff --git a/app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java b/app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java
index f886e97..41c4c23 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java
@@ -73,7 +73,7 @@ public class UpdateProfileActivity extends BaseActivity {
     private void updateProfile(){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<UserModel>> call = ApiService.apiInterface.updateProfile(
-                ApiEndPoints.API_UPDATE_PROFILE + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_UPDATE_PROFILE + SessionHelper.getCustomerToken().getToken(),
                 getUpdateProfileParams());
         call.enqueue(new Callback<ResponseObject<UserModel>>() {
             @Override
diff --git a/app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java b/app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java
index a2f411a..4d34b69 100644
--- a/app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java
+++ b/app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java
@@ -33,6 +33,7 @@ public class CartRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
     public static class CartProductViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.cartProductCountTextView) TextView cartProductCountTextView;
+        @BindView(R.id.cartProductCategoryNameTextView) TextView cartProductCategoryNameTextView;
         @BindView(R.id.cartProductNameTextView) TextView cartProductNameTextView;
         @BindView(R.id.cartProductTotalPriceTextView) TextView cartProductTotalPriceTextView;
         @BindView(R.id.removeProductFromCartImageView) ImageView removeProductFromCartImageView;
@@ -107,6 +108,7 @@ public class CartRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             case HOLDER_CART_PRODUCT :
                 CartProductViewHolder cartProductViewHolder = (CartProductViewHolder) holder;
                 cartProductViewHolder.cartProductCountTextView.setText(cartProductList.get(position).getQuantity() + " x ");
+                cartProductViewHolder.cartProductCategoryNameTextView.setText(cartProductList.get(position).getModel());
                 cartProductViewHolder.cartProductNameTextView.setText(cartProductList.get(position).getName());
                 cartProductViewHolder.cartProductTotalPriceTextView.setText(PriceHelper.roundFractions(cartProductList.get(position).getTotal()));
                 setCartInfoText(cartProductViewHolder.cartProductInfoTextView, cartProductList.get(position));
diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java
index 95e936b..a432a62 100644
--- a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java
+++ b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java
@@ -35,30 +35,18 @@ public class ApiEndPoints {
     public static final String API_GET_DELIVERY_TIME_OF_STORE = PREFIX + "getDeliveryTimeForStore" + SUFFIX;
 
 
-    public static final String API_GET_CART_PRODUCTS =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "getBasketProducts" + SUFFIX + "&token=";
+    public static final String API_GET_CART_PRODUCTS = PREFIX + "getBasketProducts" + SUFFIX + "&token=";
     //addProductsToBasketYeni
-    public static final String API_ADD_PRODUCTS_TO_BASKET =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "addProductsToBasket" + SUFFIX + "&token=";
-    public static final String API_ADD_NEW_ADDRESS =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "addAddress" + SUFFIX + "&token=";
-    public static final String API_DELETE_ADDRESS =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "deleteAddress" + SUFFIX + "&token=";
-    public static final String API_CREATE_ORDER =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "addOrder2" + SUFFIX + "&token=";
-    public static final String API_UPDATE_PASSWORD =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "passwordUpdate" + SUFFIX + "&token=";
-    public static final String API_UPDATE_PROFILE =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "updateCustomerInfo" + SUFFIX + "&token=";
-    public static final String API_REMOVE_RPODUCT_FORM_CART =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "removeProductFromBasket" + SUFFIX + "&token=";
-    public static final String API_GET_ORDER_PRODUCT_LIST =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "getOrderProducts" + SUFFIX + "&token=";
-    public static final String API_CHECK_COUPON =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "checkCoupon" + SUFFIX + "&token=";
-    public static final String API_CREATE_PAYMENT =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "checkBrainTreePayment" + SUFFIX + "&token=";
-    public static final String API_REPEAT_ORDER =
-            SessionHelper.getSelectedStore().getStoreName() + "/index.php?route=mobile/service/" + "reOrder" + SUFFIX + "&token=";
+    public static final String API_ADD_PRODUCTS_TO_BASKET = PREFIX + "addProductsToBasket" + SUFFIX + "&token=";
+    public static final String API_ADD_NEW_ADDRESS = PREFIX + "addAddress" + SUFFIX + "&token=";
+    public static final String API_DELETE_ADDRESS = PREFIX + "deleteAddress" + SUFFIX + "&token=";
+    public static final String API_CREATE_ORDER = PREFIX + "addOrder2" + SUFFIX + "&token=";
+    public static final String API_UPDATE_PASSWORD = PREFIX + "passwordUpdate" + SUFFIX + "&token=";
+    public static final String API_UPDATE_PROFILE = PREFIX + "updateCustomerInfo" + SUFFIX + "&token=";
+    public static final String API_REMOVE_RPODUCT_FORM_CART = PREFIX + "removeProductFromBasket" + SUFFIX + "&token=";
+    public static final String API_GET_ORDER_PRODUCT_LIST = PREFIX + "getOrderProducts" + SUFFIX + "&token=";
+    public static final String API_CHECK_COUPON = PREFIX + "checkCoupon" + SUFFIX + "&token=";
+    public static final String API_CREATE_PAYMENT = PREFIX + "checkBrainTreePayment" + SUFFIX + "&token=";
+    public static final String API_REPEAT_ORDER = PREFIX + "reOrder" + SUFFIX + "&token=";
 
 }
diff --git a/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java b/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java
index 330208b..3953eda 100644
--- a/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java
+++ b/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java
@@ -336,7 +336,7 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
 
     private void getCartItemCount(){
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
index 72cd4b7..c3f1d58 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
@@ -15,8 +15,12 @@ import android.widget.TextView;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Locale;
 
@@ -157,7 +161,7 @@ public class CartFragment extends BaseFragment {
     private void getCartProducts(){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
@@ -166,6 +170,7 @@ public class CartFragment extends BaseFragment {
                         response.body().getData() != null &&
                         response.body().isSuccess()){
                     cartInfoModel = response.body().getData();
+                    cartInfoModel.checkNull();
                     SharedPrefsHelper.setCartItemCount(cartInfoModel.getProducts().size());
                     SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText()));
                     MainActivity mainActivity = (MainActivity) getActivity();
@@ -223,6 +228,7 @@ public class CartFragment extends BaseFragment {
         CartProductModel.checkNull(cartInfoModel.getProducts());
         cartProductList.clear();
         cartProductList.addAll(cartInfoModel.getProducts());
+        sortCartProducts();
         cartRecyclerAdapter.notifyDataSetChanged();
         setCartLayoutsVisibility();
     }
@@ -275,7 +281,7 @@ public class CartFragment extends BaseFragment {
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<RemoveProductFromCartResponseModel>> call =
                 ApiService.apiInterface.removeProductFromCart(
-                        ApiEndPoints.API_REMOVE_RPODUCT_FORM_CART + SessionHelper.getCustomerToken().getToken(),
+                        "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_REMOVE_RPODUCT_FORM_CART + SessionHelper.getCustomerToken().getToken(),
                         getRemoveProductFromCartRequestParams(cartProductList.get(position).getCartId()));
         call.enqueue(new Callback<ResponseObject<RemoveProductFromCartResponseModel>>() {
             @Override
@@ -319,7 +325,7 @@ public class CartFragment extends BaseFragment {
 
     private void getCartItemCount(){
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, final Response<ResponseObject<CartInfoModel>> response) {
@@ -349,4 +355,44 @@ public class CartFragment extends BaseFragment {
             }
         });
     }
+
+    private void sortCartProducts(){
+
+        ArrayList<CartProductModel> tempCartProductList = new ArrayList<>();
+
+        // find margherita products
+        ArrayList<CartProductModel> margheritaPizzaCartProductModelList = new ArrayList<>(Collections2.filter(
+                cartProductList,
+                new Predicate<CartProductModel>() {
+                    @Override
+                    public boolean apply(CartProductModel cartProductModel) {
+                        return cartProductModel.getName().toLowerCase().equals("margherita");
+                    }
+                }
+        ));
+
+        // remove margherita products from cartProductList
+        if(!margheritaPizzaCartProductModelList.isEmpty()){
+            cartProductList.removeAll(margheritaPizzaCartProductModelList);
+
+        }
+
+        // sort cartProductList alphebetically
+        Collections.sort(cartProductList, new Comparator<CartProductModel>() {
+            @Override
+            public int compare(CartProductModel cpm1, CartProductModel cpm2) {
+                return cpm1.getName().compareTo(cpm2.getName());
+            }
+        });
+
+        // add margherita products to temp tempCartProductList
+        if(!margheritaPizzaCartProductModelList.isEmpty()){
+            tempCartProductList.addAll(margheritaPizzaCartProductModelList);
+        }
+
+        tempCartProductList.addAll(cartProductList);
+        cartProductList.clear();
+        cartProductList.addAll(tempCartProductList);
+
+    }
 }
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java
index baede26..4570557 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java
@@ -198,7 +198,7 @@ public class OrderHistoryFragment extends BaseFragment {
         params.put("order_id", orderId);
 
         Call<ResponseObject> call = ApiService.apiInterface.repeatOrder(
-                ApiEndPoints.API_REPEAT_ORDER + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_REPEAT_ORDER + SessionHelper.getCustomerToken().getToken(),
                 params);
         call.enqueue(new Callback<ResponseObject>() {
             @Override
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java
index cbce7a3..e7361ee 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java
@@ -19,6 +19,7 @@ import ch.pizzapp.android.R;
 import ch.pizzapp.android.activity.BaseActivity;
 import ch.pizzapp.android.activity.LoginActivity;
 import ch.pizzapp.android.activity.MyAddressesActivity;
+import ch.pizzapp.android.activity.SplashActivity;
 import ch.pizzapp.android.activity.UpdatePasswordActivity;
 import ch.pizzapp.android.activity.UpdateProfileActivity;
 import ch.pizzapp.android.api.ApiErrorUtils;
@@ -196,7 +197,9 @@ public class ProfileFragment extends BaseFragment {
         SharedPrefsHelper.clearCustomerInfo();
         SharedPrefsHelper.clearCustomerToken();
         SharedPrefsHelper.setCustomerLoggedIn(false);
-        BaseActivity.currentActivity.startActivity(new Intent(BaseActivity.currentActivity, LoginActivity.class));
+        SharedPrefsHelper.clearSelectedStore();
+        ApiService.getInstance().reset();
+        BaseActivity.currentActivity.startActivity(new Intent(BaseActivity.currentActivity, SplashActivity.class));
         BaseActivity.currentActivity.finishAffinity();
     }
 }
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 28710d2..8e67417 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -662,7 +662,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void createOrder(String paymentMethodNonce){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<Integer>> call = ApiService.apiInterface.createOrder(
-                ApiEndPoints.API_CREATE_ORDER + SessionHelper.getCustomerToken().getToken(), getCreateOrderParams(paymentMethodNonce));
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_CREATE_ORDER + SessionHelper.getCustomerToken().getToken(), getCreateOrderParams(paymentMethodNonce));
         call.enqueue(new Callback<ResponseObject<Integer>>() {
             @Override
             public void onResponse(Call<ResponseObject<Integer>> call, Response<ResponseObject<Integer>> response) {
@@ -766,7 +766,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void getCartProducts(){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
@@ -792,7 +792,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void getCartProductsWithCommission(){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProductsForCommission(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken(),
                 createOrderActivity.getSelectedPaymentMethod().getCode(),
                 createOrderActivity.getSelectedShippingMethod().getCode());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
@@ -869,7 +869,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void createBraintreePayment(final DropInResult dropInResult){
         DialogHelper.showLoadingDialog();
         Call<ResponseObject> call = ApiService.apiInterface.createPayment(
-                ApiEndPoints.API_CREATE_PAYMENT + SessionHelper.getCustomerToken().getToken(),
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_CREATE_PAYMENT + SessionHelper.getCustomerToken().getToken(),
                 getBraintreePaymentParams(dropInResult));
         call.enqueue(new Callback<ResponseObject>() {
             @Override
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
index 1753f02..02aa80e 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
@@ -234,7 +234,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
         DialogHelper.showLoadingDialog();
         Call<ResponseObject<CheckCouponModel>> call =
                 ApiService.apiInterface.checkCoupon(
-                        ApiEndPoints.API_CHECK_COUPON + SessionHelper.getCustomerToken().getToken(),
+                        "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_CHECK_COUPON + SessionHelper.getCustomerToken().getToken(),
                         couponCodeAppEditText.getText());
         call.enqueue(new Callback<ResponseObject<CheckCouponModel>>() {
             @Override
@@ -272,7 +272,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
 
     private void getCartProducts(){
         Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
-                ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
+                "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
diff --git a/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java
index bc1e1b2..42ce81a 100644
--- a/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java
+++ b/app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java
@@ -86,7 +86,9 @@ public class SessionHelper {
     }
 
     public static StoreModel getSelectedStore(){
-        return SharedPrefsHelper.getSelectedStore();
+        StoreModel selectedStore = SharedPrefsHelper.getSelectedStore();
+        return selectedStore;
+       //return SharedPrefsHelper.getSelectedStore();
     }
 
 
diff --git a/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java b/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java
index dd9e25e..56e80dd 100644
--- a/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java
+++ b/app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java
@@ -192,6 +192,11 @@ public class SharedPrefsHelper {
         return selectedStoreModel;
     }
 
+    public static void clearSelectedStore(){
+        editor.remove(PREF_KEY_USER_SELECTED_STORE);
+        editor.apply();
+    }
+
 
 
     /*
diff --git a/app/src/main/res/layout/row_cart.xml b/app/src/main/res/layout/row_cart.xml
index c4d752a..66d1cce 100644
--- a/app/src/main/res/layout/row_cart.xml
+++ b/app/src/main/res/layout/row_cart.xml
@@ -57,10 +57,25 @@
                 android:layout_toRightOf="@+id/dividerView"
                 android:layout_toEndOf="@+id/dividerView">
 
+                <TextView
+                    android:id="@+id/cartProductCategoryNameTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    fontPath="fonts/Quicksand-Light.otf"
+                    android:textSize="12sp"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginStart="12dp"
+                    android:textColor="@color/red"
+                    android:layout_marginTop="12dp"/>
+
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp">
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp">
 
                     <TextView
                         android:id="@+id/cartProductNameTextView"
@@ -68,7 +83,8 @@
                         android:layout_height="wrap_content"
                         android:textSize="16sp"
                         android:textColor="@color/black"
-                        android:padding="12dp"
+                        android:layout_marginRight="12dp"
+                        android:layout_marginEnd="12dp"
                         fontPath="fonts/Quicksand-Bold.ttf"
                         android:layout_toLeftOf="@+id/cartProductTotalPriceTextView"
                         android:layout_toStartOf="@+id/cartProductTotalPriceTextView"
@@ -80,7 +96,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/black"
-                        android:padding="8dp"
                         fontPath="fonts/Quicksand-Bold.ttf"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true"