diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to .github/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java
index 8362ee60..6b2525a4 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java
@@ -99,7 +99,7 @@ private void loadLastTracks() {
     }
 
     public void addMarker(SensorTrackInfo trackInfo) {
-        if(mapView!=null){
+        if(mapView!=null && !mapView.isShown()){
             try {
                 Marker pointMarker = new Marker(mapView);
                 pointMarker.setOnMarkerClickListener((marker, mapView) -> {