diff --git a/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java b/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
index 054b32d..b6bd62b 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
@@ -181,6 +181,7 @@ public class HomeActivity extends AppCompatActivity {
             public void onClick(View view) {
                 Intent settingIntent = new Intent(HomeActivity.this, SettingsActivity.class);
                 startActivity(settingIntent);
+                //overridePendingTransition(R.anim.activity_enter, R.anim.activity_exit);
             }
         });
 
@@ -428,15 +429,15 @@ public class HomeActivity extends AppCompatActivity {
 
         if(balanceManager.getTotalBalance() != null)
         {
-            if(iconCounter == balanceManager.getTotalBalance().size() - offset)
+            if(balanceManager.getTotalBalance().size() == 0)
             {
-                if(balanceManager.getTotalBalance().size() == 0)
+                updateNoBalance();
+            }
+            else
+            {
+                if(iconCounter == balanceManager.getTotalBalance().size() - offset)
                 {
-                    updateNoBalance();
-                }
-                else
-                {
-                    Log.d("coinfolio", "Loading heavy");
+                    Log.d(getResources().getString(R.string.debug), "Loading heavy");
 
                     UiHeavyLoadCalculator uiHeavyLoadCalculator = new UiHeavyLoadCalculator();
                     uiHeavyLoadCalculator.execute();
@@ -504,6 +505,8 @@ public class HomeActivity extends AppCompatActivity {
             {
                 if(balanceManager.getTotalBalance().size() == 0)
                 {
+                    Log.d("coinfolio", "Empty");
+
                     countIcons();
                 }
             }
diff --git a/app/src/main/java/com/nauk/coinfolio/Activities/SettingsActivity.java b/app/src/main/java/com/nauk/coinfolio/Activities/SettingsActivity.java
index 2ec71ea..d279483 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/SettingsActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/SettingsActivity.java
@@ -215,6 +215,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 
             bindPreferenceSummaryToValue(findPreference("hitbtc_publickey"));
             bindPreferenceSummaryToValue(findPreference("hitbtc_privatekey"));
+
+            bindPreferenceSummaryToValue(findPreference("binance_publickey"));
+            bindPreferenceSummaryToValue(findPreference("binance_privatekey"));
         }
 
         @Override
diff --git a/app/src/main/res/anim/activity_enter.xml b/app/src/main/res/anim/activity_enter.xml
new file mode 100644
index 0000000..a19443a
--- /dev/null
+++ b/app/src/main/res/anim/activity_enter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="500"
+        android:fromXDelta="100%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/activity_exit.xml b/app/src/main/res/anim/activity_exit.xml
new file mode 100644
index 0000000..59ae615
--- /dev/null
+++ b/app/src/main/res/anim/activity_exit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="500"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="-100%"
+        android:toYDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_exchange.xml b/app/src/main/res/xml/pref_exchange.xml
index 0bd59ff..a0f3139 100644
--- a/app/src/main/res/xml/pref_exchange.xml
+++ b/app/src/main/res/xml/pref_exchange.xml
@@ -28,6 +28,53 @@
             android:title="@string/pref_title_hitbtc_privatekey" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="@string/pref_title_exchange_binance">
+        <SwitchPreference
+            android:key="enable_binance"
+            android:title="@string/pref_title_enable_synchronization_binance" />
+
+        <EditTextPreference
+            android:capitalize="words"
+            android:dependency="enable_binance"
+            android:inputType="text"
+            android:key="binance_publickey"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_title_binance_publickey" />
+
+        <EditTextPreference
+            android:capitalize="words"
+            android:dependency="enable_binance"
+            android:inputType="text"
+            android:key="binance_privatekey"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_title_binance_privatekey" />
+
+        <!--<EditTextPreference
+            android:capitalize="words"
+            android:dependency="enable_binance"
+            android:inputType="text"
+            android:key="binance_publickey"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_title_binance_publickey" />
+
+        <EditTextPreference
+            android:capitalize="words"
+            android:dependency="enable_binance"
+            android:inputType="text"
+            android:key="binance_publickey"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/pref_title_binance_privatekey" />-->
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:title="@string/pref_title_exchange_gdax"
         android:enabled="false">
@@ -57,51 +104,6 @@
             android:title="@string/pref_title_gdax_privatekey" />
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/pref_title_exchange_binance"
-        android:enabled="true">
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="enable_binance"
-            android:title="@string/pref_title_enable_synchronization_binance" />
-
-        <EditTextPreference
-            android:capitalize="words"
-            android:dependency="enable_binance"
-            android:inputType="text"
-            android:key="binance_publickey"
-            android:selectAllOnFocus="true"
-            android:title="@string/pref_title_binance_publickey" />
-
-        <EditTextPreference
-            android:capitalize="words"
-            android:dependency="enable_binance"
-            android:inputType="text"
-            android:key="binance_privatekey"
-            android:selectAllOnFocus="true"
-            android:title="@string/pref_title_binance_privatekey" />
-
-        <!--<EditTextPreference
-            android:capitalize="words"
-            android:dependency="enable_binance"
-            android:inputType="text"
-            android:key="binance_publickey"
-            android:maxLines="1"
-            android:selectAllOnFocus="true"
-            android:singleLine="true"
-            android:title="@string/pref_title_binance_publickey" />
-
-        <EditTextPreference
-            android:capitalize="words"
-            android:dependency="enable_binance"
-            android:inputType="text"
-            android:key="binance_publickey"
-            android:maxLines="1"
-            android:selectAllOnFocus="true"
-            android:singleLine="true"
-            android:title="@string/pref_title_binance_privatekey" />-->
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:title="@string/pref_title_exchange_poloniex"
         android:enabled="false">