diff --git a/README.md b/README.md
index 3c07cdd..d12f150 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,7 @@
 # Coinfolio
 <img src="https://github.com/TanguyHerbron/Coinfolio/blob/master/app/src/main/icon_coinfolio-web.png" width="100">
+
+TODO List :</br>
+Sort currencies by marketcap in currency selection activity</br>
+Add transaction button to add quick transactions from the detailed activity</br>
+Center the price in home activity</br>
diff --git a/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java b/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java
index 80a78d3..6dede6a 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java
@@ -243,7 +243,7 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
                 });
                 break;
             case "1M":
-                currency.updateHistoryDays(this, new Currency.CurrencyCallBack() {
+                currency.updateHistoryHours(this, new Currency.CurrencyCallBack() {
                     @Override
                     public void onSuccess(Currency currency) {
                         runOnUiThread(new Runnable() {
@@ -398,6 +398,7 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
                 {
                     case 1:
                         dataChartList = currency.getHistoryHours();
+                        Log.d("coinfolio", "1 month");
                         offset = 124;
                         pointFormat = MONTH;
                         break;
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 2365778..8de9607 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
@@ -140,7 +140,8 @@ public class HomeActivity extends AppCompatActivity {
 
         //Setup main interface
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+        //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_currency_summary);
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
 
@@ -185,8 +186,6 @@ public class HomeActivity extends AppCompatActivity {
         ImageButton detailsButton = findViewById(R.id.switch_button);
         ImageButton settingsButton = findViewById(R.id.settings_button);
 
-        toolbarLayout.setExpandedTitleGravity(Gravity.CENTER);
-        toolbarLayout.setCollapsedTitleGravity(Gravity.CENTER);
         toolbarLayout.setForegroundGravity(Gravity.CENTER);
         toolbarLayout.setTitle("US$0.00");
 
diff --git a/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java b/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java
index 6196e3f..ac2cb2a 100644
--- a/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java
+++ b/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java
@@ -154,13 +154,12 @@ public class HomeLayoutGenerator {
         if(currency.getHistoryMinutes() != null)
         {
             view.findViewById(R.id.LineChartView).setVisibility(View.VISIBLE);
-            ((LineChart) view.findViewById(R.id.LineChartView)).invalidate();
+            view.findViewById(R.id.LineChartView).invalidate();
             view.findViewById(R.id.errorTextView).setVisibility(View.GONE);
         }
         else
         {
             view.findViewById(R.id.LineChartView).setVisibility(View.GONE);
-
             view.findViewById(R.id.errorTextView).setVisibility(View.VISIBLE);
         }
 
diff --git a/app/src/main/res/layout/activity_currency_summary.xml b/app/src/main/res/layout/activity_currency_summary.xml
index daf65a1..89d700b 100644
--- a/app/src/main/res/layout/activity_currency_summary.xml
+++ b/app/src/main/res/layout/activity_currency_summary.xml
@@ -29,7 +29,10 @@
                 android:fitsSystemWindows="true"
                 app:contentScrim="@drawable/gradient_background"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                app:toolbarId="@+id/toolbar">
+                app:toolbarId="@+id/toolbar"
+                app:collapsedTitleGravity="center"
+                app:expandedTitleGravity="center"
+                app:titleEnabled="true">
 
                 <TextView
                     android:id="@+id/toolbarSubtitle"
@@ -38,7 +41,7 @@
                     android:layout_gravity="center|bottom"
                     android:layout_marginBottom="35dp"
                     android:gravity="center"
-                    android:textSize="20dp"
+                    android:textSize="20sp"
                     app:layout_collapseMode="parallax"/>
 
                 <android.support.v7.widget.Toolbar
@@ -46,16 +49,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
                     app:layout_collapseMode="pin"
-                    app:popupTheme="@style/AppTheme.PopupOverlay">
+                    app:popupTheme="@style/AppTheme.PopupOverlay"
+                    android:layout_marginStart="-30dp">
 
                 </android.support.v7.widget.Toolbar>
 
-                <LinearLayout
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:layout_collapseMode="pin"
-                    android:orientation="horizontal"
-                    android:gravity="left"
                     android:layout_margin="10dp">
 
                     <ImageButton
@@ -63,26 +65,18 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/quick_button"
-                        android:visibility="visible"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_collapseMode="pin"
-                    android:orientation="horizontal"
-                    android:gravity="right"
-                    android:layout_margin="10dp">
+                        android:visibility="visible"
+                        android:layout_gravity="start"/>
 
                     <ImageButton
                         android:id="@+id/settings_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/action_settings"
-                        android:visibility="visible"/>
+                        android:visibility="visible"
+                        android:layout_gravity="end"/>
 
-                </LinearLayout>
+                </FrameLayout>
 
             </android.support.design.widget.CollapsingToolbarLayout>
         </android.support.design.widget.AppBarLayout>
diff --git a/app/src/main/res/layout/content_currency_summary.xml b/app/src/main/res/layout/content_currency_summary.xml
index eb66f56..207ae88 100644
--- a/app/src/main/res/layout/content_currency_summary.xml
+++ b/app/src/main/res/layout/content_currency_summary.xml
@@ -82,7 +82,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="gone"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:gravity="center_vertical">
 
                 <TextView
                     android:id="@+id/marketCapTextView"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 44c0d69..990ec9d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,5 +153,6 @@
 
     <string name="market_cap_textview">Total Market Capitalization :\nUS$%1$s</string>
     <string name="volume_market_cap_textview">24h volume :\nUS$%1$s</string>
+    <string name="title_activity_scrolling">ScrollingActivity</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c0e13d4..610e24d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,18 +1,25 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="swirl_ridgeColor">@color/separationLine</item>
         <item name="swirl_errorColor">@color/decrease</item>
+        <!--<item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:statusBarColor">@color/transparent</item>-->
     </style>
 
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <!--<item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:actionBarStyle">@style/ThemeActionBar</item>
+        <item name="android:windowActionBarOverlay">true</item>-->
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
@@ -24,4 +31,11 @@
         <item name="android:windowExitAnimation">@anim/zoom_in</item>
     </style>
 
+    <style name="ThemeActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
+        <item name="android:background"> @null </item>
+        <item name="background">@null</item>
+        <item name="android:displayOptions"> showHome|useLogo</item>
+        <item name="displayOptions">showHome|useLogo</item>
+
+    </style>
 </resources>