diff --git a/android_app/app/src/main/res/layout/fragment_overview.xml b/android_app/app/src/main/res/layout/fragment_overview.xml
index f4ffed16..b817077a 100644
--- a/android_app/app/src/main/res/layout/fragment_overview.xml
+++ b/android_app/app/src/main/res/layout/fragment_overview.xml
@@ -1,98 +1,117 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_alignParentBottom="true"
     android:layout_alignParentLeft="true"
     android:layout_alignParentStart="true"
-    android:weightSum="100"
-    android:padding="5dp">
+    android:orientation="vertical"
+    android:padding="5dp"
+    android:weightSum="100">
 
 
     <ScrollView
+        android:id="@+id/scrollView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:id="@+id/scrollView"
         android:layout_weight="100">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:orientation="horizontal"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
+                android:layout_height="fill_parent"
+                android:orientation="horizontal">
 
                 <TextView
+                    android:id="@+id/txtTitleUser"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/label_title_user"
-                    android:id="@+id/txtTitleUser"
                     android:layout_weight="0"
-                    android:textSize="20dp"/>
+                    android:text="@string/label_title_user"
+                    android:textSize="20dp" />
 
                 <Spinner
+                    android:id="@+id/spinUser"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/spinUser"
                     android:textSize="20dp" />
 
 
             </LinearLayout>
 
             <View
+                android:id="@+id/userLineSeparator"
                 android:layout_width="fill_parent"
                 android:layout_height="1dp"
-                android:id="@+id/userLineSeparator"
-                android:background="@android:color/darker_gray"/>
+                android:background="@android:color/darker_gray" />
 
 
-                <lecho.lib.hellocharts.view.PieChartView
-                     android:id="@+id/pieChartLast"
-                     android:layout_width="200dp"
-                     android:layout_height="150dp"
-                    android:layout_gravity="center"/>
+            <lecho.lib.hellocharts.view.PieChartView
+                android:id="@+id/pieChartLast"
+                android:layout_width="200dp"
+                android:layout_height="150dp"
+                android:layout_gravity="center" />
 
-                <lecho.lib.hellocharts.view.LineChartView
-                    android:id="@+id/lineChartLast"
-                    android:layout_width="match_parent"
-                    android:layout_height="150dp"
-                    android:layout_gravity="center"/>
+            <lecho.lib.hellocharts.view.LineChartView
+                android:id="@+id/lineChartLast"
+                android:layout_width="match_parent"
+                android:layout_height="150dp"
+                android:layout_gravity="center" />
 
 
             <TextView
+                android:id="@+id/txtTitleLastMeasurment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/label_title_last_measurement"
-                android:id="@+id/txtTitleLastMeasurment"
                 android:autoText="false"
+                android:text="@string/label_title_last_measurement"
                 android:textSize="20dp"
                 android:typeface="monospace" />
 
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="1dp"
-                android:background="@android:color/darker_gray"/>
+                android:background="@android:color/darker_gray" />
 
             <TableLayout
+                android:id="@+id/tableLayoutMeasurements"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:id="@+id/tableLayoutMeasurements">
-            </TableLayout>
+                android:layout_height="fill_parent"></TableLayout>
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="80dp" />
 
         </LinearLayout>
+
     </ScrollView>
 
-    <Button
+    <android.support.design.widget.FloatingActionButton
         android:id="@+id/btnInsertData"
-        android:layout_width="fill_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/flat_selector"
+        android:layout_margin="16dp"
+        android:clickable="true"
+        android:textColor="@android:color/white"
+        app:backgroundTint="#33B5E5"
+        app:layout_anchor="@id/scrollView"
+        app:layout_anchorGravity="bottom|right|end" />
+
+
+    <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         android:text="+"
-        android:textColor="@android:color/white" />
+        android:elevation="6dp"
+        android:textSize="18dp"
+        android:textColor="#fff"
+        app:layout_anchor="@id/btnInsertData"
+        app:layout_anchorGravity="center"/>
 
-
-</LinearLayout>
+</android.support.design.widget.CoordinatorLayout>