diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 63e5673..c22bcb9 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..ac59544 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
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 0766a36..f2188ac 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/CampaignProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/CampaignProductDetailsActivity.java
@@ -353,7 +353,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
                     SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText()));
 
                     /*
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.setCartItemCount();
                     */
                     setResult(RESULT_OK);
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 b283b3f..020258e 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java
@@ -210,7 +210,7 @@ public class OrderHistoryDetailsActivity extends BaseActivity {
                     SharedPrefsHelper.setCartTotalPrice("0");
                     SharedPrefsHelper.setUserUsedPizzapassCampaign(false);
                     SharedPrefsHelper.setUserUsedChampagneCampaign(false);
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.setCartItemCount();
                     */
                     repeatOrder();
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 ad65bf2..ee1b9d1 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/ProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/ProductDetailsActivity.java
@@ -354,7 +354,7 @@ public class ProductDetailsActivity extends BaseActivity {
                     SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText()));
 
                     /*
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.setCartItemCount();
                     */
                     setResult(RESULT_OK);
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 38fc183..e47a823 100644
--- a/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java
+++ b/app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java
@@ -357,7 +357,7 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
                         response.body().isSuccess()){
                     SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size());
                     SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText()));
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.setCartItemCount();
                     dismiss();
                 }
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java
index 6cf5256..8213ef4 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java
@@ -2,6 +2,7 @@ package ch.pizzapp.android.fragment;
 
 import android.support.v4.app.Fragment;
 
+import ch.pizzapp.android.activity.BaseActivity;
 import ch.pizzapp.android.activity.MainActivity;
 
 /**
@@ -11,7 +12,7 @@ import ch.pizzapp.android.activity.MainActivity;
 public class BaseFragment extends Fragment {
 
     public void setPizzalinkToolbarFields(boolean showHamburgerIcon, String title){
-        MainActivity mainActivity =  (MainActivity) getActivity();
+        MainActivity mainActivity =  (MainActivity) BaseActivity.currentActivity;
         if(mainActivity == null)
             return;
         mainActivity.setPizzalinkToolbarFields(showHamburgerIcon, title);
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 290df81..b2b4cea 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
@@ -216,7 +216,7 @@ public class CartFragment extends BaseFragment {
                     cartInfoModel.checkNull();
                     SharedPrefsHelper.setCartItemCount(cartInfoModel.getProducts().size());
                     SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText()));
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.updateBadge();
                     mainActivity.setCartTotalLayoutVisibility(false);
                     setCartTotalFields();
@@ -258,7 +258,7 @@ public class CartFragment extends BaseFragment {
                     setCartLayoutsVisibility();
                     SharedPrefsHelper.setCartItemCount(0);
                     SharedPrefsHelper.setCartTotalPrice("0");
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.setCartItemCount();
                 }
 
@@ -347,7 +347,7 @@ public class CartFragment extends BaseFragment {
                         @Override
                         public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                             SharedPrefsHelper.setCartItemCount(cartProductList.size());
-                            MainActivity mainActivity = (MainActivity) getActivity();
+                            MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                             mainActivity.setCartItemCount();
                             mainActivity.reopenCartFragment();
                         }
@@ -403,7 +403,7 @@ public class CartFragment extends BaseFragment {
                                 public void onDismiss(DialogInterface dialogInterface) {
                                     SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size());
                                     SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText()));
-                                    MainActivity mainActivity = (MainActivity) getActivity();
+                                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                                     mainActivity.setCartItemCount();
                                     mainActivity.reopenCartFragment();
                                 }
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
index 9292584..136d298 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
@@ -80,7 +80,7 @@ public class MenuFragment extends BaseFragment {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES && resultCode == RESULT_OK){
-            MainActivity mainActivity = (MainActivity) getActivity();
+            MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
             mainActivity.setCartItemCount();
         }
     }
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 4570557..eed2af2 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java
@@ -172,7 +172,7 @@ public class OrderHistoryFragment extends BaseFragment {
                     SharedPrefsHelper.setCartTotalPrice("0");
                     SharedPrefsHelper.setUserUsedPizzapassCampaign(false);
                     SharedPrefsHelper.setUserUsedChampagneCampaign(false);
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.setCartItemCount();
                     */
                     repeatOrder(orderId);
@@ -207,7 +207,7 @@ public class OrderHistoryFragment extends BaseFragment {
                 if(response.isSuccessful() &&
                         response.body().getData() != null &&
                         response.body().isSuccess()){
-                    MainActivity mainActivity = (MainActivity) getActivity();
+                    MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
                     mainActivity.openFragmentAt(2);
                 }
                 else {
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java
index 92df8b8..20f04d9 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java
@@ -78,7 +78,7 @@ public class ProductFragment extends BaseFragment {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES && resultCode == RESULT_OK){
-            MainActivity mainActivity = (MainActivity) getActivity();
+            MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
             mainActivity.setCartItemCount();
         }
     }
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java
index 43209f3..ca16e07 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java
@@ -13,6 +13,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ch.pizzapp.android.R;
+import ch.pizzapp.android.activity.BaseActivity;
 import ch.pizzapp.android.activity.CreateOrderActivity;
 import ch.pizzapp.android.helper.SharedPrefsHelper;
 import ch.pizzapp.android.model.cart.CartProductModel;
@@ -83,7 +84,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
     }
 
     private void initViews(){
-        createOrderActivity = (CreateOrderActivity) getActivity();
+        createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){
             slicePizzaLayout.setVisibility(View.VISIBLE);
             if(createOrderActivity.getSlicePizza() != null){
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java
index 8e69432..cde04ff 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java
@@ -9,6 +9,7 @@ import butterknife.BindString;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ch.pizzapp.android.R;
+import ch.pizzapp.android.activity.BaseActivity;
 import ch.pizzapp.android.activity.CreateOrderActivity;
 import ch.pizzapp.android.helper.SessionHelper;
 import ch.pizzapp.android.helper.SharedPrefsHelper;
@@ -44,7 +45,7 @@ public class CreateOrderResultFragment extends CreateOrderBaseFragment {
 
     @OnClick( R.id.nextTextView)
     protected void onClick(){
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         createOrderActivity.onNextClicked(FRAGMENT_NAME);
     }
 
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 cc7e327..b4c9f9a 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
@@ -137,7 +137,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
 
     @OnClick({R.id.previousTextView, R.id.nextTextView})
     protected void onClick(View view){
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         switch (view.getId()){
             case R.id.previousTextView:
                 createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
@@ -152,7 +152,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
 
         nextTextView.setText(confirmOrderText);
 
-        createOrderActivity = (CreateOrderActivity) getActivity();
+        createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
 
         orderPersonFullnamePizzalinkInfoLayout.setText(SessionHelper.getUser().getFullname());
         orderShippingMethodPizzalinkInfoLayout.setText(createOrderActivity.getSelectedShippingMethod().getTitle());
@@ -526,7 +526,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
 
     private String createOrderNote(){
 
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         StringBuilder stringBuilder = new StringBuilder();
         if(isCartContainsAnyPizza()){
             stringBuilder.append(slicePizzaForStoreText).append(" : ");
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 ad18af8..449952c 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
@@ -83,7 +83,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
 
     @OnClick({R.id.previousTextView, R.id.nextTextView})
     protected void onClick(View view){
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         switch (view.getId()){
             case R.id.previousTextView:
                 createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
@@ -112,7 +112,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
     }
 
     private void initViews(){
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         if(createOrderActivity.getCouponCode() != null){
             couponCodeAppEditText.setText(createOrderActivity.getCouponCode());
         }
@@ -193,7 +193,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
         PaymentMethodModel.sort(paymentMethodModels);
         paymentMethodList.clear();
         paymentMethodList.addAll(paymentMethodModels);
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         if(paymentMethodList.size() != 0){
 
             if(createOrderActivity.getSelectedPaymentMethod() == null){
@@ -293,7 +293,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
                 if(response.isSuccessful() &&
                         response.body().getData() != null &&
                         response.body().isSuccess()){
-                    CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+                    CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
                     CartInfoModel cartInfoModel = response.body().getData();
                     cartInfoModel.checkNull();
                     createOrderActivity.setCartInfo(cartInfoModel);
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java
index 75e43f5..2838134 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java
@@ -85,7 +85,7 @@ public class ShippingAddressFragment extends CreateOrderBaseFragment {
 
     @OnClick({R.id.addNewAddressButton, R.id.previousTextView, R.id.nextTextView})
     protected void onClick(View view){
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         switch (view.getId()){
             case R.id.addNewAddressButton:
                 Intent addNewAddressIntent = new Intent(BaseActivity.currentActivity,
@@ -151,7 +151,7 @@ public class ShippingAddressFragment extends CreateOrderBaseFragment {
                 sortAddresses();
             }
 
-            CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+            CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
 
             if(createOrderActivity.getSelectedShippingAddress() == null){
                 addressList.get(0).setSelected(true);
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java
index 258acf1..26de863 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java
@@ -73,7 +73,7 @@ public class ShippingMethodFragment extends CreateOrderBaseFragment {
             return;
         }
 
-        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
         createOrderActivity.setSelectedShippingMethod(selectedShippingMethodModel);
         createOrderActivity.onNextClicked(FRAGMENT_NAME);
     }
@@ -116,7 +116,7 @@ public class ShippingMethodFragment extends CreateOrderBaseFragment {
         shippingMethodList.addAll(shippingMethodModels);
         if(shippingMethodList.size() != 0){
 
-            CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+            CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
 
             if(createOrderActivity.getSelectedShippingMethod() == null){
                 shippingMethodList.get(0).setSelected(true);