diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fec628f..87a4b0c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/AppCompatPreferenceActivity.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/AppCompatPreferenceActivity.java
index 9af21a1..828b034 100644
--- a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/AppCompatPreferenceActivity.java
@@ -4,6 +4,7 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
@@ -42,6 +43,7 @@ public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
     }
 
     @Override
+    @NonNull
     public MenuInflater getMenuInflater() {
         return getDelegate().getMenuInflater();
     }
diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
index 35ac3ef..45e6ca7 100644
--- a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
+++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
@@ -1,10 +1,6 @@
 package fr.utbm.lo53.p2017.positionningapp;
 
-import android.content.Context;
 import android.graphics.Bitmap;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.constraint.ConstraintLayout;
@@ -18,7 +14,6 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
 
 import com.android.volley.Request;
@@ -32,10 +27,6 @@ import com.android.volley.toolbox.Volley;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Collections;
-import java.util.List;
 import java.util.Random;
 
 public class PositioningActivity extends BaseActivity {
@@ -183,13 +174,14 @@ public class PositioningActivity extends BaseActivity {
         return (this.mapId != null && this.mapId.equals(mapId));
     }
 
-    private void getMap(int mapId) {
+    private void getMap(final int mapId) {
         mapView.setVisibility(View.INVISIBLE);
         ImageRequest mapRequest = new ImageRequest(
             getURLSolver().mapBytesURL(mapId),
             new Response.Listener<Bitmap>() {
                 @Override
                 public void onResponse(Bitmap bitmap) {
+                    PositioningActivity.this.mapId = mapId;
                     mapView.setImageBitmap(bitmap);
                     mapView.setVisibility(View.VISIBLE);
                     Snackbar.make(mapView, "You need to set a point before measurement.", Snackbar.LENGTH_LONG)
diff --git a/app/src/main/res/layout/content_calibration.xml b/app/src/main/res/layout/content_calibration.xml
index d909639..97bfcdc 100644
--- a/app/src/main/res/layout/content_calibration.xml
+++ b/app/src/main/res/layout/content_calibration.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="50dp"
         android:adjustViewBounds="true"
-        android:paddingLeft="0dp"
+        android:paddingStart="0dp"
         android:paddingTop="0dp"
         android:scaleType="fitXY"
         app:layout_constraintHorizontal_bias="0.0"
@@ -52,7 +52,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
-        android:text="Set Point"
+        android:text="@string/set_point"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -67,7 +67,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
-        android:text="Cancel"
+        android:text="@string/Cancel"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -83,7 +83,7 @@
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
         android:onClick="sendCalibrateRequest"
-        android:text="Measure"
+        android:text="@string/Measure"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
diff --git a/app/src/main/res/layout/content_positioning.xml b/app/src/main/res/layout/content_positioning.xml
index b225657..ea4cd7d 100644
--- a/app/src/main/res/layout/content_positioning.xml
+++ b/app/src/main/res/layout/content_positioning.xml
@@ -73,9 +73,10 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-            android:text="Start locating"
-            android:textAppearance="@android:style/TextAppearance.Material.Display2"
+            android:text="@string/start_locating"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
             android:textColor="@color/colorAccent"
+            android:textSize="40sp"
             app:layout_constraintBottom_toBottomOf="@+id/hiding_image"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..4d44345 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,5 +2,5 @@
 <resources>
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">#ff4081</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f52757f..1600382 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">PositionningApp</string>
+    <string name="app_name">PositioningApp</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_settings">Settings</string>
 
@@ -91,4 +91,10 @@
 
     <string name="pref_title_port">Port</string>
     <string name="pref_default_port">8080</string>
+
+
+    <string name="set_point">Set point</string>
+    <string name="Cancel">Cancel</string>
+    <string name="Measure">Measure</string>
+    <string name="start_locating">Start locating</string>
 </resources>
--
libgit2 0.21.4