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 792df15..87ea794 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
@@ -13,7 +13,7 @@ import android.view.MenuItem;
 import android.widget.Button;
 import android.widget.ImageView;
 
-public class Calibration extends AppCompatActivity {
+public class Calibration extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -40,9 +40,7 @@ public class Calibration extends AppCompatActivity {
 
         MapMarker.setVisibility(MapMarker.INVISIBLE);
         cancelButton.setVisibility(cancelButton.INVISIBLE);
-        cancelButton.setX(50);
         measureButton.setVisibility(measureButton.INVISIBLE);
-        measureButton.setX(300);
 
         Map.setOnTouchListener(new View.OnTouchListener() {
             @Override
@@ -86,11 +84,12 @@ 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;
     }
 
diff --git a/app/src/main/res/layout/content_calibration.xml b/app/src/main/res/layout/content_calibration.xml
index 1285502..6e089d0 100644
--- a/app/src/main/res/layout/content_calibration.xml
+++ b/app/src/main/res/layout/content_calibration.xml
@@ -45,45 +45,45 @@
     <Button
         android:id="@+id/setPointButton"
         style="@style/Widget.AppCompat.Button"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:text="Set Point"
-        app:layout_constraintTop_toBottomOf="@+id/Map"
-        android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="50dp"
+        android:text="Set Point"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintHorizontal_bias="0.0" />
+        app:layout_constraintTop_toBottomOf="@+id/Map" />
 
     <Button
         android:id="@+id/cancelButton"
-        android:layout_width="368dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:text="Cancel"
-        app:layout_constraintTop_toBottomOf="@+id/measureButton"
-        android:layout_marginLeft="8dp"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/measureButton" />
 
     <Button
         android:id="@+id/measureButton"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:text="Measure"
-        app:layout_constraintTop_toBottomOf="@+id/Map"
-        android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="50dp"
+        android:text="Measure"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginLeft="8dp"
-        app:layout_constraintLeft_toLeftOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/Map" />
 
 </android.support.constraint.ConstraintLayout>
--
libgit2 0.21.4