diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/BaseActivity.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/BaseActivity.java
new file mode 100644
index 0000000..7bc1f9b
--- /dev/null
+++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/BaseActivity.java
@@ -0,0 +1,43 @@
+package fr.utbm.lo53.p2017.positionningapp;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class BaseActivity extends AppCompatActivity {
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            Intent intent = new Intent(this, SettingsActivity.class);
+            startActivity(intent);
+            return true;
+        }
+        if (id == R.id.open_locate_activity) {
+            Intent intent = new Intent(this, PositioningActivity.class);
+            startActivity(intent);
+            return true;
+        }
+        if (id == R.id.open_calibration_activity) {
+            Intent intent = new Intent(this, Calibration.class);
+            startActivity(intent);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_calibration, menu);
+        return true;
+    }
+
+}
diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java
index ddb5238..c62e896 100644
--- a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java
+++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java
@@ -12,7 +12,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
 
-public class Calibration extends AppCompatActivity {
+public class Calibration extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,30 +54,10 @@ public class Calibration extends AppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_calibration, menu);
+        super.onCreateOptionsMenu(menu);
+        MenuItem item = menu.findItem(R.id.open_locate_activity);
+        item.setVisible(true);
         return true;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            Intent intent = new Intent(this, SettingsActivity.class);
-            startActivity(intent);
-            return true;
-        }
-        if (id == R.id.bt_open_locate_activity) {
-            Intent intent = new Intent(this, PositioningActivity.class);
-            startActivity(intent);
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
 }
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 18795c1..64969f9 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,13 @@
 package fr.utbm.lo53.p2017.positionningapp;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AlphaAnimation;
@@ -12,7 +15,7 @@ import android.view.animation.Animation;
 import android.widget.Button;
 import android.widget.ImageView;
 
-public class PositioningActivity extends AppCompatActivity {
+public class PositioningActivity extends BaseActivity {
 
     private ImageView alphaBackground;
     private Button buttonStart;
@@ -35,6 +38,14 @@ public class PositioningActivity extends AppCompatActivity {
         });
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuItem item = menu.findItem(R.id.open_calibration_activity);
+        item.setVisible(true);
+        return true;
+    }
+
     private void fadeOutAndHideImage() {
         Animation fadeOut = new AlphaAnimation(1, 0);
         fadeOut.setInterpolator(new AccelerateInterpolator());
diff --git a/app/src/main/res/menu/menu_calibration.xml b/app/src/main/res/menu/menu_calibration.xml
index eba3b78..81368fa 100644
--- a/app/src/main/res/menu/menu_calibration.xml
+++ b/app/src/main/res/menu/menu_calibration.xml
@@ -7,9 +7,19 @@
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never" />
+
     <item
-        android:id="@+id/bt_open_locate_activity"
+        android:id="@+id/open_locate_activity"
         android:icon="@drawable/map_marker"
         android:orderInCategory="101"
-        android:title="Locate !" />
+        android:title="@string/menu_title_locate"
+        android:visible="false" />
+
+    <item
+        android:id="@+id/open_calibration_activity"
+        android:icon="@drawable/map_marker"
+        android:orderInCategory="101"
+        android:title="@string/menu_title_calibrate"
+        android:visible="false" />
+
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d78dda..4cf9211 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,9 @@
     <string name="action_settings">Settings</string>
     <string name="title_activity_settings">Settings</string>
 
+    <string name="menu_title_locate">Locate</string>
+    <string name="menu_title_calibrate">Calibrate</string>
+
     <!-- Strings related to Settings -->
 
     <!-- Example General settings -->
@@ -75,4 +78,11 @@
 
     <string name="pref_title_vibrate">Vibrate</string>
     <string name="title_activity_positioning">Positioning</string>
+
+    <!-- Pref settings -->
+    <string name="pref_title_hostname">Hostname</string>
+    <string name="pref_default_hostname">127.0.0.1</string>
+
+    <string name="pref_title_port">Port</string>
+    <string name="default_port">8080</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index c1ca5e2..0f4a336 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -30,19 +30,19 @@
         android:positiveButtonText="@null"
         android:title="@string/pref_title_add_friends_to_messages" />
     <EditTextPreference
-        android:defaultValue="127.0.0.1"
-        android:key="edit_text_hostname"
+        android:defaultValue="@string/pref_default_hostname"
+        android:key="hostname"
         android:selectAllOnFocus="true"
         android:singleLine="true"
-        android:title="Hostname" />
+        android:title="@string/pref_title_hostname" />
     <EditTextPreference
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:defaultValue="8080"
-        android:key="edit_text_port"
+        android:defaultValue="@string/default_port"
+        android:key="port"
         android:selectAllOnFocus="true"
         android:singleLine="true"
-        android:title="Port" />
+        android:title="@string/pref_title_port" />
 
 
 </PreferenceScreen>
--
libgit2 0.21.4