diff --git a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/TransactionsFragment.java b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/TransactionsFragment.java
index 2641b70..61fba84 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/TransactionsFragment.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/TransactionsFragment.java
@@ -161,15 +161,18 @@ public int compare(Object o1, Object o2) {
                 }
             });
 
-            TransactionListAdapter transactionListAdapter = new TransactionListAdapter(getActivity(), transactions);
+            if(getActivity() != null)
+            {
+                TransactionListAdapter transactionListAdapter = new TransactionListAdapter(getActivity(), transactions);
 
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    transactionLayout.setAdapter(transactionListAdapter);
-                    transactionLayout.setTextFilterEnabled(false);
-                }
-            });
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        transactionLayout.setAdapter(transactionListAdapter);
+                        transactionLayout.setTextFilterEnabled(false);
+                    }
+                });
+            }
         }
     }
 
diff --git a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java
index 4305c16..5cd2023 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/MarketCapitalization.java
@@ -9,6 +9,7 @@
 import android.os.Bundle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
+import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.graphics.Palette;
 import android.text.SpannableString;
@@ -54,6 +55,7 @@ public class MarketCapitalization extends Fragment implements CryptocompareNotif
     private PreferencesManager preferencesManager;
     private CoinmarketCapAPIManager coinmarketCapAPIManager;
     private SwipeRefreshLayout refreshLayout;
+    private NestedScrollView nestedScrollView;
     private long lastTimestamp;
     private String defaultCurrency;
     private CryptocompareApiManager cryptocompareApiManager;
@@ -89,6 +91,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         defaultCurrency = preferencesManager.getDefaultCurrency();
         lastTimestamp = 0;
 
+        nestedScrollView = view.findViewById(R.id.nestedMarketCap);
+
         setupRefreshLayout();
 
         setupDrawerButton();
@@ -304,12 +308,12 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
                 switch (motionEvent.getAction())
                 {
                     case MotionEvent.ACTION_DOWN:
-                        refreshLayout.setEnabled(false);
+                        nestedScrollView.setEnabled(false);
                         break;
                     case MotionEvent.ACTION_MOVE:
                         break;
                     default:
-                        refreshLayout.setEnabled(true);
+                        nestedScrollView.setEnabled(true);
                         break;
                 }
 
diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java
index 767d472..6d7a1c2 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/BuyFragment.java
@@ -296,8 +296,8 @@ public void onClick(View v) {
         });
         feesCurrencySpinner = view.findViewById(R.id.feesCurrency_editText_buy);
 
-        currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>());
-        currencyFeeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        currencyFeeAdapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_spinner_item, new ArrayList<>());
+        currencyFeeAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
         feesCurrencySpinner.setAdapter(currencyFeeAdapter);
 
         deductHoldingsSwitch = view.findViewById(R.id.deductHoldingsBuy);
diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java
index 4976a63..f91ce8b 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/SellFragment.java
@@ -268,7 +268,7 @@ public void onClick(View v) {
         feesCurrencySpinner = view.findViewById(R.id.feesCurrency_editText_sell);
 
         currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>());
-        currencyFeeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        currencyFeeAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
         feesCurrencySpinner.setAdapter(currencyFeeAdapter);
 
         if(fragmentPair != null)
@@ -522,6 +522,8 @@ public void onExchangeUpdated() {
 
     public void updatePair(Pair pair)
     {
+        fragmentPair = pair;
+
         currencyFeeAdapter = new ArrayAdapter<String>(getSecureContext(), android.R.layout.simple_spinner_item, new ArrayList<>());
         currencyFeeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         feesCurrencySpinner.setAdapter(currencyFeeAdapter);
diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java
index d057a5b..b36deb2 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionFragments/TransferFragment.java
@@ -262,15 +262,15 @@ private void setupToSpinner()
     private void setupSpinnesr()
     {
         ArrayAdapter<String> fromAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.from_transfer_options_string_array));
-        fromAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        fromAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
         fromSpinner.setAdapter(fromAdapter);
 
         ArrayAdapter<String> toAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.to_transfer_options_string_array));
-        toAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        toAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
         toSpinner.setAdapter(toAdapter);
 
         ArrayAdapter<String> feeAdapter = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item, getResources().getStringArray(R.array.fees_options));
-        feeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        feeAdapter.setDropDownViewResource(R.layout.spinner_dropdown_black);
         feeSpinner.setAdapter(feeAdapter);
 
         fromSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
diff --git a/app/src/main/res/drawable-v21/spinner_background_header.xml b/app/src/main/res/drawable-v21/spinner_background_header.xml
new file mode 100644
index 0000000..7246389
--- /dev/null
+++ b/app/src/main/res/drawable-v21/spinner_background_header.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true">
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/hardWhite"/>
+
+                    <corners
+                        android:topLeftRadius="5dp"
+                        android:topRightRadius="5dp"/>
+                    <padding
+                        android:left="3dp"
+                        android:right="3dp"
+                        android:top="3dp"
+                        android:bottom="3dp"/>
+                </shape>
+            </item>
+            <item
+                android:gravity="center_vertical|right"
+                android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
+        </layer-list>
+    </item>
+
+    <item android:state_enabled="false">
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/softWhite"/>
+
+                    <corners
+                        android:topLeftRadius="5dp"
+                        android:topRightRadius="5dp"/>
+                    <padding
+                        android:left="3dp"
+                        android:right="3dp"
+                        android:top="3dp"
+                        android:bottom="3dp"/>
+                </shape>
+            </item>
+            <item
+                android:gravity="center_vertical|right"
+                android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
+        </layer-list>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/spinner_background_header.xml b/app/src/main/res/drawable/spinner_background_header.xml
index 7246389..b6e1358 100644
--- a/app/src/main/res/drawable/spinner_background_header.xml
+++ b/app/src/main/res/drawable/spinner_background_header.xml
@@ -16,9 +16,6 @@
                         android:bottom="3dp"/>
                 </shape>
             </item>
-            <item
-                android:gravity="center_vertical|right"
-                android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
         </layer-list>
     </item>
 
@@ -38,9 +35,6 @@
                         android:bottom="3dp"/>
                 </shape>
             </item>
-            <item
-                android:gravity="center_vertical|right"
-                android:drawable="@drawable/ic_arrow_drop_down_white_24dp"/>
         </layer-list>
     </item>
 </selector>
diff --git a/app/src/main/res/layout-v21/homeactivity_fragment_marketcap.xml b/app/src/main/res/layout-v21/homeactivity_fragment_marketcap.xml
index 9d3726a..31351d3 100644
--- a/app/src/main/res/layout-v21/homeactivity_fragment_marketcap.xml
+++ b/app/src/main/res/layout-v21/homeactivity_fragment_marketcap.xml
@@ -50,174 +50,182 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:background="@drawable/gradient_background">
 
-        <LinearLayout android:id="@+id/layoutMarketCap"
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/nestedMarketCap"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingTop="20dp"
             android:background="@drawable/list_background">
 
-            <ProgressBar
-                android:id="@+id/progressBarMarketCap"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="?android:attr/progressBarStyleLarge"
-                android:layout_gravity="center"
-                android:background="@drawable/circular_progress_bar" />
-
-            <LinearLayout
-                android:id="@+id/layoutProgressMarketCap"
+            <LinearLayout android:id="@+id/layoutMarketCap"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:visibility="gone"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingTop="20dp"
+                android:background="@drawable/list_background">
 
-                <FrameLayout
+                <ProgressBar
+                    android:id="@+id/progressBarMarketCap"
                     android:layout_width="match_parent"
-                    android:layout_height="350dp"
-                    android:layout_marginTop="5dp">
-
-                    <com.herbron.moodl.CustomLayouts.CustomPieChart
-                        android:id="@+id/marketCapPieChart"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"/>
-
-                    <ImageView
-                        android:id="@+id/currencyIcon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:clickable="false"
-                        android:focusable="false"
-                        android:layout_gravity="center"
-                        android:visibility="gone"
-                        android:maxHeight="110dp"
-                        android:maxWidth="110dp"
-                        android:adjustViewBounds="true"/>
-
-                </FrameLayout>
+                    android:layout_height="wrap_content"
+                    style="?android:attr/progressBarStyleLarge"
+                    android:layout_gravity="center"
+                    android:background="@drawable/circular_progress_bar" />
 
                 <LinearLayout
-                    android:id="@+id/layoutMarketDetails"
+                    android:id="@+id/layoutProgressMarketCap"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_margin="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/textViewTitle"
-                        android:textStyle="bold"
-                        android:textSize="20sp"/>
+                    android:layout_height="match_parent"
+                    android:visibility="gone"
+                    android:orientation="vertical">
 
-                    <View
+                    <FrameLayout
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/separationLineSize"
-                        android:layout_gravity="center_vertical"
-                        android:layout_margin="10dp"
-                        android:background="@color/separationColor" />
+                        android:layout_height="350dp"
+                        android:layout_marginTop="5dp">
+
+                        <com.herbron.moodl.CustomLayouts.CustomPieChart
+                            android:id="@+id/marketCapPieChart"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"/>
+
+                        <ImageView
+                            android:id="@+id/currencyIcon"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="false"
+                            android:focusable="false"
+                            android:layout_gravity="center"
+                            android:visibility="gone"
+                            android:maxHeight="110dp"
+                            android:maxWidth="110dp"
+                            android:adjustViewBounds="true"/>
+
+                    </FrameLayout>
 
                     <LinearLayout
+                        android:id="@+id/layoutMarketDetails"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:baselineAligned="false">
+                        android:orientation="vertical"
+                        android:layout_margin="10dp">
 
-                        <LinearLayout
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="0.5"
-                            android:orientation="vertical">
+                            android:id="@+id/textViewTitle"
+                            android:textStyle="bold"
+                            android:textSize="20sp"/>
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/market_capitalization"
-                                android:textStyle="bold"/>
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/separationLineSize"
+                            android:layout_gravity="center_vertical"
+                            android:layout_margin="10dp"
+                            android:background="@color/separationColor" />
 
-                            <TextView
-                                android:id="@+id/textViewMarketCap"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:baselineAligned="false">
 
                             <LinearLayout
-                                android:id="@+id/layoutPercentageDominance"
-                                android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                android:visibility="gone"
-                                android:layout_marginTop="5dp">
+                                android:layout_weight="0.5"
+                                android:orientation="vertical">
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/dominance_percentage"
+                                    android:text="@string/market_capitalization"
                                     android:textStyle="bold"/>
 
                                 <TextView
-                                    android:id="@+id/textViewDominancePercentage"
+                                    android:id="@+id/textViewMarketCap"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"/>
 
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:id="@+id/layoutActiveCrypto"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                android:layout_marginTop="5dp">
-
-                                <TextView
+                                <LinearLayout
+                                    android:id="@+id/layoutPercentageDominance"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/active_cryptocurrencies"
-                                    android:textStyle="bold"/>
+                                    android:orientation="vertical"
+                                    android:visibility="gone"
+                                    android:layout_marginTop="5dp">
 
-                                <TextView
-                                    android:id="@+id/textViewActiveCrypto"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/dominance_percentage"
+                                        android:textStyle="bold"/>
 
-                            </LinearLayout>
+                                    <TextView
+                                        android:id="@+id/textViewDominancePercentage"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
 
-                        </LinearLayout>
+                                </LinearLayout>
 
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.5"
-                            android:orientation="vertical">
+                                <LinearLayout
+                                    android:id="@+id/layoutActiveCrypto"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical"
+                                    android:layout_marginTop="5dp">
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/volume_24h"
-                                android:textStyle="bold"/>
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/active_cryptocurrencies"
+                                        android:textStyle="bold"/>
+
+                                    <TextView
+                                        android:id="@+id/textViewActiveCrypto"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
 
-                            <TextView
-                                android:id="@+id/textViewVolume"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                                </LinearLayout>
+
+                            </LinearLayout>
 
                             <LinearLayout
-                                android:id="@+id/layoutActiveMarkets"
-                                android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                android:layout_marginTop="5dp">
+                                android:layout_weight="0.5"
+                                android:orientation="vertical">
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/active_marketes"
+                                    android:text="@string/volume_24h"
                                     android:textStyle="bold"/>
 
                                 <TextView
-                                    android:id="@+id/textViewActiveMarkets"
+                                    android:id="@+id/textViewVolume"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"/>
 
+                                <LinearLayout
+                                    android:id="@+id/layoutActiveMarkets"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical"
+                                    android:layout_marginTop="5dp">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/active_marketes"
+                                        android:textStyle="bold"/>
+
+                                    <TextView
+                                        android:id="@+id/textViewActiveMarkets"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+
+                                </LinearLayout>
+
                             </LinearLayout>
 
                         </LinearLayout>
@@ -228,6 +236,6 @@
 
             </LinearLayout>
 
-        </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
     </android.support.v4.widget.SwipeRefreshLayout>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/homeactivity_fragment_marketcap.xml b/app/src/main/res/layout/homeactivity_fragment_marketcap.xml
index 6fa469b..2628a9a 100644
--- a/app/src/main/res/layout/homeactivity_fragment_marketcap.xml
+++ b/app/src/main/res/layout/homeactivity_fragment_marketcap.xml
@@ -51,174 +51,181 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:background="@drawable/gradient_background">
 
-        <LinearLayout android:id="@+id/layoutMarketCap"
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/nestedMarketCap"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingTop="20dp"
             android:background="@drawable/list_background">
 
-            <ProgressBar
-                android:id="@+id/progressBarMarketCap"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="?android:attr/progressBarStyleLarge"
-                android:layout_gravity="center"
-                android:background="@drawable/circular_progress_bar" />
-
-            <LinearLayout
-                android:id="@+id/layoutProgressMarketCap"
+            <LinearLayout android:id="@+id/layoutMarketCap"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:visibility="gone"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingTop="20dp">
 
-                <FrameLayout
+                <ProgressBar
+                    android:id="@+id/progressBarMarketCap"
                     android:layout_width="match_parent"
-                    android:layout_height="350dp"
-                    android:layout_marginTop="5dp">
-
-                    <com.herbron.moodl.CustomLayouts.CustomPieChart
-                        android:id="@+id/marketCapPieChart"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"/>
-
-                    <ImageView
-                        android:id="@+id/currencyIcon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:clickable="false"
-                        android:focusable="false"
-                        android:layout_gravity="center"
-                        android:visibility="gone"
-                        android:maxHeight="110dp"
-                        android:maxWidth="110dp"
-                        android:adjustViewBounds="true"/>
-
-                </FrameLayout>
+                    android:layout_height="wrap_content"
+                    style="?android:attr/progressBarStyleLarge"
+                    android:layout_gravity="center"
+                    android:background="@drawable/circular_progress_bar" />
 
                 <LinearLayout
-                    android:id="@+id/layoutMarketDetails"
+                    android:id="@+id/layoutProgressMarketCap"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_margin="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/textViewTitle"
-                        android:textStyle="bold"
-                        android:textSize="20sp"/>
+                    android:layout_height="match_parent"
+                    android:visibility="gone"
+                    android:orientation="vertical">
 
-                    <View
+                    <FrameLayout
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/separationLineSize"
-                        android:layout_gravity="center_vertical"
-                        android:layout_margin="10dp"
-                        android:background="@color/separationColor" />
+                        android:layout_height="350dp"
+                        android:layout_marginTop="5dp">
+
+                        <com.herbron.moodl.CustomLayouts.CustomPieChart
+                            android:id="@+id/marketCapPieChart"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"/>
+
+                        <ImageView
+                            android:id="@+id/currencyIcon"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:clickable="false"
+                            android:focusable="false"
+                            android:layout_gravity="center"
+                            android:visibility="gone"
+                            android:maxHeight="110dp"
+                            android:maxWidth="110dp"
+                            android:adjustViewBounds="true"/>
+
+                    </FrameLayout>
 
                     <LinearLayout
+                        android:id="@+id/layoutMarketDetails"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:baselineAligned="false">
+                        android:orientation="vertical"
+                        android:layout_margin="10dp">
 
-                        <LinearLayout
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="0.5"
-                            android:orientation="vertical">
+                            android:id="@+id/textViewTitle"
+                            android:textStyle="bold"
+                            android:textSize="20sp"/>
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/market_capitalization"
-                                android:textStyle="bold"/>
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/separationLineSize"
+                            android:layout_gravity="center_vertical"
+                            android:layout_margin="10dp"
+                            android:background="@color/separationColor" />
 
-                            <TextView
-                                android:id="@+id/textViewMarketCap"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:baselineAligned="false">
 
                             <LinearLayout
-                                android:id="@+id/layoutPercentageDominance"
-                                android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                android:visibility="gone"
-                                android:layout_marginTop="5dp">
+                                android:layout_weight="0.5"
+                                android:orientation="vertical">
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/dominance_percentage"
+                                    android:text="@string/market_capitalization"
                                     android:textStyle="bold"/>
 
                                 <TextView
-                                    android:id="@+id/textViewDominancePercentage"
+                                    android:id="@+id/textViewMarketCap"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"/>
 
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:id="@+id/layoutActiveCrypto"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                android:layout_marginTop="5dp">
-
-                                <TextView
+                                <LinearLayout
+                                    android:id="@+id/layoutPercentageDominance"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/active_cryptocurrencies"
-                                    android:textStyle="bold"/>
+                                    android:orientation="vertical"
+                                    android:visibility="gone"
+                                    android:layout_marginTop="5dp">
 
-                                <TextView
-                                    android:id="@+id/textViewActiveCrypto"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"/>
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/dominance_percentage"
+                                        android:textStyle="bold"/>
 
-                            </LinearLayout>
+                                    <TextView
+                                        android:id="@+id/textViewDominancePercentage"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
 
-                        </LinearLayout>
+                                </LinearLayout>
 
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.5"
-                            android:orientation="vertical">
+                                <LinearLayout
+                                    android:id="@+id/layoutActiveCrypto"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical"
+                                    android:layout_marginTop="5dp">
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/volume_24h"
-                                android:textStyle="bold"/>
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/active_cryptocurrencies"
+                                        android:textStyle="bold"/>
+
+                                    <TextView
+                                        android:id="@+id/textViewActiveCrypto"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
 
-                            <TextView
-                                android:id="@+id/textViewVolume"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"/>
+                                </LinearLayout>
+
+                            </LinearLayout>
 
                             <LinearLayout
-                                android:id="@+id/layoutActiveMarkets"
-                                android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:orientation="vertical"
-                                android:layout_marginTop="5dp">
+                                android:layout_weight="0.5"
+                                android:orientation="vertical">
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/active_marketes"
+                                    android:text="@string/volume_24h"
                                     android:textStyle="bold"/>
 
                                 <TextView
-                                    android:id="@+id/textViewActiveMarkets"
+                                    android:id="@+id/textViewVolume"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"/>
 
+                                <LinearLayout
+                                    android:id="@+id/layoutActiveMarkets"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical"
+                                    android:layout_marginTop="5dp">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/active_marketes"
+                                        android:textStyle="bold"/>
+
+                                    <TextView
+                                        android:id="@+id/textViewActiveMarkets"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"/>
+
+                                </LinearLayout>
+
                             </LinearLayout>
 
                         </LinearLayout>
@@ -229,6 +236,6 @@
 
             </LinearLayout>
 
-        </LinearLayout>
+        </android.support.v4.widget.NestedScrollView>
     </android.support.v4.widget.SwipeRefreshLayout>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/record_transaction_fragment_buy.xml b/app/src/main/res/layout/record_transaction_fragment_buy.xml
index d883f0b..c13495f 100644
--- a/app/src/main/res/layout/record_transaction_fragment_buy.xml
+++ b/app/src/main/res/layout/record_transaction_fragment_buy.xml
@@ -100,7 +100,7 @@
                 android:id="@+id/feesCurrency_editText_buy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"/>
+                android:layout_weight="1" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/spinner_dropdown_black.xml b/app/src/main/res/layout/spinner_dropdown_black.xml
new file mode 100644
index 0000000..bf21419
--- /dev/null
+++ b/app/src/main/res/layout/spinner_dropdown_black.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/dropdownListPreferredItemHeight"
+    android:ellipsize="marquee"
+    android:textColor="#000000"/>
\ No newline at end of file