diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index b240c88..28b88f5 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 75dac50..119ebae 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
+    </list>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/app/src/main/java/com/nauk/moodl/Activities/HomeActivity.java b/app/src/main/java/com/nauk/moodl/Activities/HomeActivity.java
index 9874946..aae90a9 100644
--- a/app/src/main/java/com/nauk/moodl/Activities/HomeActivity.java
+++ b/app/src/main/java/com/nauk/moodl/Activities/HomeActivity.java
@@ -4,26 +4,21 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.BottomNavigationView;
 import android.support.design.widget.NavigationView;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.ViewPager;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.nauk.moodl.Activities.DetailsActivityFragments.Home;
 import com.nauk.moodl.Activities.HomeActivityFragments.MarketCapitalization;
 import com.nauk.moodl.Activities.HomeActivityFragments.Summary;
 import com.nauk.moodl.Activities.HomeActivityFragments.Watchlist;
-import com.nauk.moodl.HomeActivityPagerAdapter;
-import com.nauk.moodl.LayoutManagers.CustomViewPager;
 import com.nauk.moodl.R;
 
 //Use WilliamChart for charts https://github.com/diogobernardino/WilliamChart
@@ -57,16 +52,6 @@ public class HomeActivity extends AppCompatActivity {
         holdingsFragment = new Summary();
         marketFragment = new MarketCapitalization();
 
-        getSupportFragmentManager().beginTransaction()
-                .add(R.id.content_frame, watchlistFragment)
-                .addToBackStack(null)
-                .add(R.id.content_frame, marketFragment)
-                .addToBackStack(null)
-                .add(R.id.content_frame, holdingsFragment)
-                .addToBackStack(null)
-                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
-                .commit();
-
         drawerLayout = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
 
@@ -78,6 +63,8 @@ public class HomeActivity extends AppCompatActivity {
             @Override
             public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 
+                item.setChecked(true);
+
                 switch (item.getItemId())
                 {
                     case R.id.navigation_watchlist:
@@ -92,9 +79,10 @@ public class HomeActivity extends AppCompatActivity {
                     case R.id.navigation_settings:
                         Intent settingIntent = new Intent(getApplicationContext(), SettingsActivity.class);
                         startActivity(settingIntent);
+                        item.setChecked(false);
                         break;
                 }
-                item.setChecked(true);
+
                 drawerLayout.closeDrawers();
 
                 return false;
@@ -108,24 +96,24 @@ public class HomeActivity extends AppCompatActivity {
 
     private void showFragment(Fragment fragment) {
         FragmentManager fragmentManager = getSupportFragmentManager();
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
         if(currentFragment != null)
         {
-            fragmentManager.beginTransaction()
-                    .hide(currentFragment)
-                    .show(fragment)
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
-                    .commit();
+            fragmentTransaction.hide(currentFragment);
+        }
+
+        if(fragment.isAdded())
+        {
+            fragmentTransaction.show(fragment);
         }
         else
         {
-            fragmentManager.beginTransaction()
-                    .show(fragment)
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
-                    .commit();
+            fragmentTransaction.add(R.id.content_frame, fragment).addToBackStack(null);
         }
 
-
+        fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+                .commit();
 
         currentFragment = fragment;
     }
@@ -152,9 +140,8 @@ public class HomeActivity extends AppCompatActivity {
 
         switch (id)
         {
-            /*case R.id.action_settings:
-                Log.d(this.getResources().getString(R.string.debug), "Setting button toggled");
-                break;*/
+            case R.id.navigation_settings:
+                break;
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Summary.java b/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Summary.java
index 7b5ce1c..ac4e7f5 100644
--- a/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Summary.java
+++ b/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Summary.java
@@ -10,7 +10,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.os.Bundle;
 import android.support.v4.view.GravityCompat;
@@ -30,7 +29,6 @@ import android.widget.TextView;
 
 import com.nauk.moodl.Activities.CurrencySelectionActivity;
 import com.nauk.moodl.Activities.HomeActivity;
-import com.nauk.moodl.Activities.SettingsActivity;
 import com.nauk.moodl.DataManagers.BalanceManager;
 import com.nauk.moodl.DataManagers.CurrencyData.Currency;
 import com.nauk.moodl.DataManagers.CurrencyData.CurrencyCardview;
diff --git a/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Watchlist.java b/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Watchlist.java
index 3648cb9..4028081 100644
--- a/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Watchlist.java
+++ b/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/Watchlist.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.os.Bundle;
 import android.support.v4.view.GravityCompat;
@@ -61,7 +62,7 @@ public class Watchlist extends Fragment {
     private boolean editModeEnabled;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
     {
         view = inflater.inflate(R.layout.fragment_watchlist_homeactivity, container, false);
 
@@ -73,13 +74,7 @@ public class Watchlist extends Fragment {
         defaultCurrency = preferencesManager.getDefaultCurrency();
         currencyTickerList = new CurrencyTickerList(getActivity());
         tickerUpdated = false;
-        currencyTickerList.update(new BalanceManager.IconCallBack() {
-            @Override
-            public void onSuccess() {
-                tickerUpdated = true;
-                checkUpdatedData();
-            }
-        });
+        updateTickerList();
 
         editModeEnabled = false;
 
@@ -103,6 +98,25 @@ public class Watchlist extends Fragment {
         return view;
     }
 
+    private void updateTickerList()
+    {
+        AsyncTask<Void, Integer, Void> updater = new AsyncTask<Void, Integer, Void>() {
+            @Override
+            protected Void doInBackground(Void... voids) {
+                currencyTickerList.update(new BalanceManager.IconCallBack() {
+                    @Override
+                    public void onSuccess() {
+                        tickerUpdated = true;
+                        checkUpdatedData();
+                    }
+                });
+                return null;
+            }
+        };
+
+        updater.execute();
+    }
+
     private void setupEditButton()
     {
         ImageButton editButton = view.findViewById(R.id.edit_button);
@@ -119,8 +133,11 @@ public class Watchlist extends Fragment {
                     {
                         View watchlistElement = watchlistLayout.getChildAt(i);
 
-                        watchlistElement.setClickable(true);
-                        collapseW(watchlistElement.findViewById(R.id.deleteCardWatchlist));
+                        if(watchlistElement instanceof LinearLayout)
+                        {
+                            watchlistElement.setClickable(true);
+                            collapseW(watchlistElement.findViewById(R.id.deleteCardWatchlist));
+                        }
                     }
                 }
                 else
@@ -131,8 +148,11 @@ public class Watchlist extends Fragment {
                     {
                         View watchlistElement = watchlistLayout.getChildAt(i);
 
-                        watchlistElement.setClickable(false);
-                        expandW(watchlistElement.findViewById(R.id.deleteCardWatchlist));
+                        if(watchlistElement instanceof LinearLayout)
+                        {
+                            watchlistElement.setClickable(false);
+                            expandW(watchlistElement.findViewById(R.id.deleteCardWatchlist));
+                        }
                     }
                 }
             }
@@ -200,15 +220,23 @@ public class Watchlist extends Fragment {
             lastTimestamp = System.currentTimeMillis()/1000;
             detailsUpdated = false;
 
-            watchlistManager.updateWatchlist();
-
-            currencyDetailsList.update(new BalanceManager.IconCallBack() {
+            AsyncTask<Void, Integer, Void> watchlistUpdater = new AsyncTask<Void, Integer, Void>() {
                 @Override
-                public void onSuccess() {
-                    detailsUpdated = true;
-                    checkUpdatedData();
+                protected Void doInBackground(Void... voids) {
+                    watchlistManager.updateWatchlist();
+
+                    currencyDetailsList.update(new BalanceManager.IconCallBack() {
+                        @Override
+                        public void onSuccess() {
+                            detailsUpdated = true;
+                            checkUpdatedData();
+                        }
+                    });
+                    return null;
                 }
-            });
+            };
+
+            watchlistUpdater.execute();
         }
         else
         {
diff --git a/app/src/main/res/layout/summary_drawer_header.xml b/app/src/main/res/layout/summary_drawer_header.xml
index b88b9fb..81915db 100644
--- a/app/src/main/res/layout/summary_drawer_header.xml
+++ b/app/src/main/res/layout/summary_drawer_header.xml
@@ -5,12 +5,36 @@
     android:background="@drawable/gradient_background"
     android:padding="16dp"
     android:orientation="vertical"
-    android:gravity="bottom">
+    android:gravity="center">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/ic_launcher_moodl"
+            android:layout_marginRight="10dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/app_name"
+            android:textStyle="bold"
+            android:layout_gravity="center"
+            android:textColor="@color/white"
+            android:textSize="24sp"/>
+
+    </LinearLayout>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Moodl"
-        android:textStyle="bold"/>
+        android:id="@+id/totalValueDrawer"
+        android:textColor="@color/white"
+        android:textSize="20sp"/>
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/summary_navigation_drawer.xml b/app/src/main/res/menu/summary_navigation_drawer.xml
index 6d90c1e..c07ba87 100644
--- a/app/src/main/res/menu/summary_navigation_drawer.xml
+++ b/app/src/main/res/menu/summary_navigation_drawer.xml
@@ -17,10 +17,18 @@
             android:icon="@drawable/ic_pie_chart_black_24dp"
             android:title="@string/title_market_cap" />
 
-        <item
-            android:id="@+id/navigation_settings"
-            android:icon="@drawable/ic_settings_black_24dp"
-            android:title="@string/title_activity_settings" />
-
     </group>
+
+    <item android:title="Other">
+        <menu>
+            <group android:checkableBehavior="single">
+
+                <item
+                    android:id="@+id/navigation_settings"
+                    android:icon="@drawable/ic_settings_black_24dp"
+                    android:title="@string/title_activity_settings" />
+
+            </group>
+        </menu>
+    </item>
 </menu>