diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8d2df47..2ab1e27 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
@@ -12,6 +13,12 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="myModules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 515b13a..57073a4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,71 +7,82 @@ android:keepScreenOn="true"
 tools:context="de.fhws.indoor.sensorreadout.MainActivity">
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:orientation="vertical"
-    tools:context=".MainActivity"
-    android:background="#333">
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:orientation="vertical"
+        tools:context=".MainActivity"
+        android:background="#333">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:layout_width="50dp"
+                android:layout_height="wrap_content"
+                android:text="stop"
+                android:id="@+id/btnStop"
+                android:background="@drawable/btnstopcolor"/>
+
+            <Button
+                android:layout_width="50dp"
+                android:layout_height="wrap_content"
+                android:text="start"
+                android:id="@+id/btnStart"
+                android:background="@drawable/btnstartcolor"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <Spinner
+                android:layout_width="58dip"
+                android:layout_height="48dip"
+                android:id="@+id/pathspinner"
+                android:background="#64bbe5"
+                />
+
+            <Spinner
+                android:layout_width="58dip"
+                android:layout_height="48dip"
+                android:id="@+id/groundspinner"
+                android:background="#64bbe5"
+                android:layout_alignBottom="@+id/btnGround" />
+
+        </LinearLayout>
 
     <Button
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:text="stop"
-        android:id="@+id/btnStop"
-        android:background="@drawable/btnstopcolor"/>
-
-    <Button
-        android:layout_width="50dp"
-        android:layout_height="wrap_content"
-        android:text="start"
-        android:id="@+id/btnStart"
-        android:background="@drawable/btnstartcolor"/>
+        android:layout_width="fill_parent"
+        android:layout_height="96dip"
+        android:text="Ground Truth"
+        android:id="@+id/btnGround"
+        android:layout_gravity="right"
+        android:background="#64bbe5"
+        />
 
+    </LinearLayout>
 </LinearLayout>
 
-<Spinner
-    android:layout_width="58dip"
-    android:layout_height="48dip"
-    android:id="@+id/pathspinner"
-    android:layout_marginLeft="66dip"
-    android:layout_marginTop="16dip"
-    android:background="#64bbe5"
-    />
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="#222"
+        android:layout_marginTop="126dip"
+        android:orientation="horizontal"
+        android:id="@+id/layoutMain">
+    </LinearLayout>
 
-<Spinner
-    android:layout_width="58dip"
-    android:layout_height="48dip"
-    android:id="@+id/groundspinner"
-    android:layout_marginLeft="66dip"
-    android:layout_marginTop="64dip"
-    android:background="#64bbe5"
-
-    android:layout_alignBottom="@+id/btnGround" />
-
-<Button
-    android:layout_width="fill_parent"
-    android:layout_height="96dip"
-    android:text="Ground Truth"
-    android:id="@+id/btnGround"
-    android:layout_gravity="right"
-    android:layout_marginLeft="125dip"
-    android:layout_marginTop="16dip"
-    android:layout_marginRight="16dip"
-    android:background="#64bbe5"
-    />
-
-<LinearLayout
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#222"
-    android:layout_marginTop="126dip"
-    android:orientation="horizontal"
-    android:id="@+id/layoutMain">
-
-</LinearLayout>
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
index e0b366a..03bced9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f23df6e..9829f78 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Thu Jun 02 19:04:18 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip