diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 176c01a11..5e3bfb6e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,9 +34,18 @@
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="com.android.vending.BILLING" />
 
-    <uses-feature android:name="android.hardware.camera.flash" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.flash"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.location"
+        android:required="false" />
 
     <application
         android:name=".app.ApplicationInstance"
@@ -317,4 +326,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.java b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.java
index ed1248992..91d853c93 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.java
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.java
@@ -398,32 +398,36 @@ private void updateEnd() {
                 R.string.round) + " " + (data.getCurrentRound().index + 1) + "/" + data.training
                 .getRounds().size());
         updateNavigationButtons();
-
-        // Send message to wearable app, that we are starting an end
-        new Thread(InputActivity.this::startWearNotification).start();
+        updateWearNotification();
     }
 
     private void startWearNotification() {
         NotificationInfo info = buildInfo();
-        manager = new WearMessageManager(this, info);
+        if (manager == null) {
+            manager = new WearMessageManager(this, info);
+        } else {
+            manager.sendMessageUpdate(info);
+        }
     }
 
     private NotificationInfo buildInfo() {
-        String title = getString(R.string.passe) + " " + (data.getEnds().size());
+        String title = getString(R.string.my_targets);
         String text = "";
 
         // Initialize message text
         if (data.getEnds().size() > 0) {
             End lastEnd = lastItem(data.getEnds());
-            if(lastEnd != null) {
+            if (lastEnd != null && lastEnd.getId() == null && data.getEnds().size() > 1) {
+                lastEnd = data.getEnds().get(data.getEnds().size() - 2);
+            }
+            if (lastEnd != null && lastEnd.getId() != null) { //TODO change when merging with #4
+                title = getString(R.string.passe) + " " + (lastEnd.index + 1);
                 for (Shot shot : lastEnd.getShots()) {
                     text += data.getCurrentRound().getTarget()
                             .zoneToString(shot.scoringRing, shot.index) + " ";
                 }
                 text += "\n";
             }
-        } else {
-            title = getString(R.string.my_targets);
         }
 
         // Load bow settings
@@ -438,6 +442,11 @@ private void updateNavigationButtons() {
         updateNextButton();
     }
 
+    private void updateWearNotification() {
+        // Send message to wearable app, that we are starting an end
+        new Thread(InputActivity.this::startWearNotification).start();
+    }
+
     private void updatePreviousButton() {
         final boolean isFirstEnd = data.endIndex == 0;
         final boolean isFirstRound = data.roundIndex == 0;
@@ -532,8 +541,11 @@ public void onEndUpdated(List<Shot> changedEnd) {
 
     @Override
     public void onEndFinished(List<Shot> shots, boolean remote) {
-        if(remote && data.getCurrentRound().getEnds().size() > data.endIndex) {
-            data.endIndex = data.getCurrentRound().getEnds().size();
+        if (remote) {
+            data.endIndex = data.getCurrentRound().getEnds().size() - 1;
+            if (data.getCurrentEnd().getId() != null) {
+                data.endIndex = data.getCurrentRound().getEnds().size();
+            }
         }
         data.getCurrentEnd().setShots(shots);
         data.getCurrentEnd().exact = targetView.getInputMode() == EInputMethod.PLOTTING && !remote;
@@ -543,11 +555,10 @@ public void onEndFinished(List<Shot> shots, boolean remote) {
 
         data.getCurrentEnd().save();
 
-        if (manager != null) {
-            manager.sendMessageUpdate(buildInfo());
-        }
         if (remote) {
-            showEnd(data.getEnds().size());
+            showEnd(data.getEnds().size() - 1);
+        } else {
+            updateWearNotification();
         }
         updateNavigationButtons();
         supportInvalidateOptionsMenu();
diff --git a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.java b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.java
index f2754d294..630d7375d 100644
--- a/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.java
+++ b/app/src/main/java/de/dreier/mytargets/features/training/input/TargetView.java
@@ -33,7 +33,6 @@
 import android.text.InputType;
 import android.text.TextPaint;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Property;
 import android.view.MotionEvent;
 import android.view.View;
@@ -112,7 +111,6 @@ public Matrix get(TargetView targetView) {
     private static final int POINTER_OFFSET_Y_DP = -60;
     private static final int MIN_END_RECT_HEIGHT_DP = 80;
     private static final int KEYBOARD_INNER_PADDING_DP = 40;
-    private static final String TAG = "TargetView";
     private Matrix[] spotMatrices;
     private boolean arrowNumbering;
     private Dimension arrowDiameter;
@@ -198,11 +196,6 @@ private void init() {
 
     @Override
     public void setEnd(End end) {
-        Log.d(TAG, "setEnd: " + end.getShots());
-        shots = end.getShots();
-        setCurrentShotIndex(getNextShotIndex(-1));
-        endRenderer.setShots(shots);
-        endRenderer.setSelection(getCurrentShotIndex(), null, EndRenderer.MAX_CIRCLE_SIZE);
         EInputMethod inputMethod;
         if (end.getId() != null) {
             inputMethod = end.exact ? PLOTTING : KEYBOARD;
@@ -210,8 +203,7 @@ public void setEnd(End end) {
             inputMethod = SettingsManager.getInputMethod();
         }
         setInputMethod(inputMethod, false);
-        animateToNewState();
-        notifyTargetShotsChanged();
+        super.setEnd(end);
     }
 
     public void setArrow(Dimension diameter, boolean numbers) {
@@ -577,6 +569,7 @@ private void onLongPressArrow() {
                 .inputType(InputType.TYPE_CLASS_TEXT)
                 .input("", shots.get(pressed).comment, (dialog, input) -> {
                     shots.get(pressed).comment = input.toString();
+                    notifyEndFinished();
                     notifyTargetShotsChanged();
                 })
                 .negativeText(android.R.string.cancel)
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index ffe76e1c7..777990caa 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ac832ebd5..37be1c680 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -380,5 +380,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 02182b7f9..fba39fe52 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 179ad378f..e0bb82160 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -338,5 +338,4 @@
   <string name="show_total_score">Zobrazit celkové skóre</string>
   <string name="show_percentage">Zobrazit procenta</string>
   <string name="show_arrow_average">Zobrazit průměr na šíp</string>
-  <string name="backup_folder">Složka</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 0dee40007..c753faaa8 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9cf4732ce..383c94fd4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -297,7 +297,7 @@
   <string name="bow_nocking_point">Nockpunkt</string>
   <string name="bow_string">Sehne</string>
   <string name="bow_scope_magnification">Scope Vergrößerung</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
+  <string name="bow_rest_stiffness">Steifigkeit</string>
   <string name="bow_button">Button</string>
   <string name="more_fields">Weitere Felder</string>
   <string name="recently_used">Zuletzt verwendet</string>
@@ -324,5 +324,4 @@
   <string name="show_total_score">Maximal erreichbare Ringzahl anzeigen</string>
   <string name="show_percentage">Prozent anzeigen</string>
   <string name="show_arrow_average">Pfeildurchschnitt anzeigen</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 8a77d1d9e..777990caa 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -16,9 +16,9 @@
   -->
 <resources>
   <!-- General -->
-  <string name="preferences">Recurve</string>
-  <string name="prev">Bow</string>
-  <string name="next">Yumi</string>
+  <string name="preferences">Options</string>
+  <string name="prev">Previous</string>
+  <string name="next">Next</string>
   <string name="save">Save</string>
   <string name="custom">Custom</string>
   <string name="training">Training</string>
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6742017c6..2736154a3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Mostrar puntuación total</string>
   <string name="show_percentage">Mostrar porcentajes</string>
   <string name="show_arrow_average">Mostrar media de flechas</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ffe76e1c7..777990caa 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 76afb1501..7268e8a0f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -136,7 +136,7 @@
   <!-- Settings -->
   <string name="backup_action">Sauvegarde</string>
   <string name="import_action">Importer</string>
-  <string name="exports_as_csv">Exports as csv</string>
+  <string name="exports_as_csv">Exporter en CSV</string>
   <string name="licences">Licences - Open Source</string>
   <string name="licences_summary">Notes légales sur les licences</string>
   <string name="version">Version %s</string>
@@ -256,10 +256,10 @@
   <string name="arrow_diameter_scale">Échelle de diamètre de flèche</string>
   <string name="timestamp">Date et heure</string>
   <string name="change_target_face">Changer de blason</string>
-  <string name="your_first_training">Your first training</string>
+  <string name="your_first_training">Votre première entrainement</string>
   <string name="grouping">Groupement</string>
   <string name="show_clusters">Groupe</string>
-  <string name="first_training_description">Tap the plus to start a new training.</string>
+  <string name="first_training_description">Appuyez sur le plus pour commencer un nouveau entrainement.</string>
   <string name="show_average">Moyenne</string>
   <string name="show_none">Vide</string>
   <string name="left_handed">Gaucher</string>
@@ -289,40 +289,39 @@
   <string name="monthly">Mensuel</string>
   <string name="connection_failed">Echec de la connexion !</string>
   <string name="shooting_indoor">Tir en salle</string>
-  <string name="bow_rest_vertical_position">Vertical position</string>
-  <string name="bow_rest">Rest</string>
-  <string name="bow_rest_horizontal_position">Horizontal position</string>
+  <string name="bow_rest_vertical_position">Position verticale</string>
+  <string name="bow_rest">Repose flèche</string>
+  <string name="bow_rest_horizontal_position">Position horizontale</string>
   <string name="bow_cam_settings">Cam settings</string>
   <string name="bow_letoff_weight">Letoff weight</string>
-  <string name="bow_nocking_point">Nocking point</string>
-  <string name="bow_string">String</string>
-  <string name="bow_scope_magnification">Scope magnification</string>
-  <string name="bow_rest_stiffness">Stiffness</string>
-  <string name="bow_button">Button</string>
-  <string name="more_fields">More fields</string>
-  <string name="recently_used">Recently used</string>
-  <string name="intro_title_track_training_progress">Forget paper scoresheets!</string>
+  <string name="bow_nocking_point">Nockset</string>
+  <string name="bow_string">Corde</string>
+  <string name="bow_scope_magnification">Zoom du scope</string>
+  <string name="bow_rest_stiffness">Rigidité</string>
+  <string name="bow_button">Berger button</string>
+  <string name="more_fields">Autres champs</string>
+  <string name="recently_used">Utilisé récemment</string>
+  <string name="intro_title_track_training_progress">Oublier la feuille de scores !</string>
   <string name="intro_description_track_training_progress">With exact arrow plotting,\nyou can get more useful insights\nout of your training data.</string>
-  <string name="intro_title_everything_in_one_place">Everything you need\nin one place</string>
+  <string name="intro_title_everything_in_one_place">Tout ce qu\'il vous faut\nen un endroit</string>
   <string name="intro_description_everything_in_one_place">Including bow-, arrow-\nand sightmark-management,\narchery timer, statistics \nand much more&#8230;</string>
   <string name="average_arrow_score_per_end">Average arrow score per end</string>
-  <string name="show_end">Show end</string>
-  <string name="show_round">Show round</string>
-  <string name="show_training">Show training</string>
-  <string name="summary">Summary</string>
+  <string name="show_end">Affichage sur la volée</string>
+  <string name="show_round">Affichage sur la serie</string>
+  <string name="show_training">Affichage sur l\'entraînement</string>
+  <string name="summary">Résumé</string>
   <string name="end">End</string>
-  <string name="average_of">Average of</string>
-  <string name="displayed_shots">Displayed shots</string>
-  <string name="invalid_decimal_number">Invalid decimal number</string>
-  <string name="not_within_expected_range_mm">Not within the expected range of 1 to 20 mm</string>
-  <string name="not_within_expected_range_inch">Not within the expected range of 0 to 1 inch</string>
-  <string name="next_round">Next round</string>
-  <string name="previous_round">Previous round</string>
-  <string name="overview">Overview</string>
+  <string name="average_of">La moyenne de</string>
+  <string name="displayed_shots">Tirs affichés</string>
+  <string name="invalid_decimal_number">Nombre décimal non valide</string>
+  <string name="not_within_expected_range_mm">Pas dans l\'intervalle prévu de 1 à 20mm</string>
+  <string name="not_within_expected_range_inch">Pas dans l\'intervalle attendu de 0 à 1 pouce</string>
+  <string name="next_round">Série suivante</string>
+  <string name="previous_round">Série précédente</string>
+  <string name="overview">Résumé</string>
   <string name="score">Score</string>
-  <string name="show_reached_score">Show reached score</string>
-  <string name="show_total_score">Show total score</string>
-  <string name="show_percentage">Show percentage</string>
-  <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
+  <string name="show_reached_score">Afficher le score</string>
+  <string name="show_total_score">Voir le score total</string>
+  <string name="show_percentage">Voir le pourcentage</string>
+  <string name="show_arrow_average">Afficher la moyenne par flèche</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index bcd5c7663..2c4a41ea3 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">A teljes pontszám</string>
   <string name="show_percentage">Százalékos megjelenítés</string>
   <string name="show_arrow_average">Mutasd a vesszők pontátlagát</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 875d75423..14ff33c00 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -310,5 +310,4 @@
   <string name="show_total_score">Tunjukkan nilai keseluruhan</string>
   <string name="show_percentage">Tunjukkan persentase</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 54f67982d..b525b7136 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index e1fa2500f..df6f51f48 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -352,5 +352,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c217b7d62..c0468970f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -310,5 +310,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 282452658..7852f99a4 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -310,5 +310,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 22a95de1d..051557b46 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Vis total poengsum</string>
   <string name="show_percentage">Vis prosent</string>
   <string name="show_arrow_average">Vis pil gjennomsnitt</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c0476932b..56b54db0b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 22a95de1d..051557b46 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Vis total poengsum</string>
   <string name="show_percentage">Vis prosent</string>
   <string name="show_arrow_average">Vis pil gjennomsnitt</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 832f2ecde..3700436bb 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -338,5 +338,4 @@
   <string name="show_total_score">Pokaż całkowity wynik</string>
   <string name="show_percentage">Pokaż procenty</string>
   <string name="show_arrow_average">Pokaż średnią strzały</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a68e3589c..e492333e9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index e69b2e2e6..c06f40bb2 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f3cc42842..572822790 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -338,5 +338,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 805c881fb..98a1004fd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -338,5 +338,4 @@
   <string name="show_total_score">Показать общий результат</string>
   <string name="show_percentage">Показать в процентах</string>
   <string name="show_arrow_average">Показать среднее значение за выстрел</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 99a032c2f..21ef0f87d 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -338,5 +338,4 @@
   <string name="show_total_score">Zobraziť celkové skóre</string>
   <string name="show_percentage">Zobraziť percento</string>
   <string name="show_arrow_average">Zobraziť priemer na šíp</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index a177a2638..420422a0a 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -352,5 +352,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index f3cc42842..572822790 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -338,5 +338,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b608c770e..69c3ba5a6 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c7b3b5a16..5e89c8903 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -324,5 +324,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index cdddea2c2..f29d29904 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -338,5 +338,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 282452658..7852f99a4 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -310,5 +310,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3b22f7bc4..e4356fcfa 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -310,5 +310,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6c81cb33a..6828f8fc7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -310,5 +310,4 @@
   <string name="show_total_score">Show total score</string>
   <string name="show_percentage">Show percentage</string>
   <string name="show_arrow_average">Show arrow average</string>
-  <string name="backup_folder">Folder</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index f5d9bdb12..79ad4d6d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,7 +81,7 @@ ext {
             screengrab           : '1.0.2',
             retrofit             : '2.2.0',
             roundedImageView     : '2.2.1',
-            support              : '25.3.0',
+            support              : '25.3.1',
             supportWearable      : '2.0.0',
             testSupport          : '0.5',
             truth                : '0.32',
@@ -110,4 +110,4 @@ dependencyUpdates.resolutionStrategy = {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.java b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.java
index 121098a32..78e236eeb 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.java
+++ b/shared/src/main/java/de/dreier/mytargets/shared/analysis/aggregation/cluster/AggregationStrategyBase.java
@@ -87,7 +87,7 @@ public void setColor(int color) {
     }
 
     protected boolean isCancelled() {
-        return computeTask.isCancelled();
+        return computeTask == null || computeTask.isCancelled();
     }
 
     private class ComputeTask extends AsyncTask<List<Shot>, Integer, IAggregationResultRenderer> {
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.java b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.java
index d77989132..6c9136c68 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.java
+++ b/shared/src/main/java/de/dreier/mytargets/shared/targets/drawable/TargetImpactDrawable.java
@@ -85,8 +85,8 @@ protected void onPostDraw(CanvasWrapper canvas, int faceIndex) {
                 drawArrow(canvas, s, false);
             }
         }
-        if(focusedArrow != null) {
-            drawFocusedArrow(canvas, focusedArrow);
+        if (focusedArrow != null) {
+            drawFocusedArrow(canvas, focusedArrow, faceIndex);
         }
     }
 
@@ -112,9 +112,10 @@ public void setFocusedArrow(Shot shot) {
         }
     }
 
-    private void drawFocusedArrow(CanvasWrapper canvas, Shot shot) {
-        final int faceIndex = shot.index % model.getFaceCount();
-        setMatrixForTargetFace(canvas, faceIndex);
+    private void drawFocusedArrow(CanvasWrapper canvas, Shot shot, int drawFaceIndex) {
+        if (shot.index % model.getFaceCount() != drawFaceIndex) {
+            return;
+        }
 
         paintFill.setColor(0xFF009900);
         canvas.drawCircle(shot.x, shot.y, arrowRadius, paintFill);
diff --git a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.java b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.java
index 950c8f73e..1608bfe2f 100644
--- a/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.java
+++ b/shared/src/main/java/de/dreier/mytargets/shared/views/TargetViewBase.java
@@ -29,7 +29,6 @@
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
 import android.support.v4.widget.ExploreByTouchHelper;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ -48,7 +47,6 @@
 import de.dreier.mytargets.shared.utils.EndRenderer;
 
 public abstract class TargetViewBase extends View implements View.OnTouchListener {
-    private static final String TAG = "TargetViewBase";
     private final TargetAccessibilityTouchHelper touchHelper = new TargetAccessibilityTouchHelper(
             this);
     private final List<VirtualView> virtualViews = new ArrayList<>();
@@ -147,7 +145,6 @@ public boolean dispatchHoverEvent(MotionEvent event) {
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        Log.d(TAG, "onLayout: ");
         updateLayout();
         animateToNewState();
         updateVirtualViews();
@@ -224,6 +221,7 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
         // If finger is released go to next shoot
         if (motionEvent.getAction() == MotionEvent.ACTION_UP && isCurrentlySelecting()) {
             onArrowChanged();
+            notifyEndFinished();
             return true;
         }
         return true;
@@ -260,10 +258,13 @@ protected int getNextShotIndex(int currentShotIndex) {
     }
 
     protected void notifyTargetShotsChanged() {
+        invalidate();
+    }
+
+    protected void notifyEndFinished() {
         if (currentShotIndex == EndRenderer.NO_SELECTION && setListener != null) {
             setListener.onEndFinished(shots, false);
         }
-        invalidate();
     }
 
     protected Animator getCircleAnimation() {
diff --git a/shared/src/main/res/values-de/target_faces.xml b/shared/src/main/res/values-de/target_faces.xml
index d9f478e66..5f73c4dc0 100644
--- a/shared/src/main/res/values-de/target_faces.xml
+++ b/shared/src/main/res/values-de/target_faces.xml
@@ -51,13 +51,13 @@
   <string name="dbsc_blowpipe">DBSC Blasrohr</string>
   <!-- Scoring styles -->
   <string name="fcfs_color_reversed">FCFS Farbe (10-1 umgekehrt)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
+  <string name="recurve_style_x_1">Recurve-Stil (X-1)</string>
+  <string name="recurve_style_10_1">Recurve-Stil (10-1)</string>
+  <string name="recurve_style_x_5">Recurve-Stil (X-5)</string>
+  <string name="recurve_style_10_5">Recurve-Stil (10-5)</string>
+  <string name="recurve_style_x_6">Recurve-Stil (X-6)</string>
+  <string name="recurve_style_10_6">Recurve-Stil (10-6)</string>
+  <string name="recurve_style_x_8">Recurve-Stil (X-8)</string>
+  <string name="recurve_style_10_8">Recurve-Stil (10-8)</string>
   <string name="compound_style">Compound-Stil</string>
 </resources>
diff --git a/shared/src/main/res/values-fr/target_faces.xml b/shared/src/main/res/values-fr/target_faces.xml
index bb3f29051..7dd205386 100644
--- a/shared/src/main/res/values-fr/target_faces.xml
+++ b/shared/src/main/res/values-fr/target_faces.xml
@@ -51,13 +51,13 @@
   <string name="dbsc_blowpipe">DBSC sarbacane</string>
   <!-- Scoring styles -->
   <string name="fcfs_color_reversed">FCFS Color (Reversed 10–1)</string>
-  <string name="recurve_style_x_1">Recurve style (X–1)</string>
-  <string name="recurve_style_10_1">Recurve style (10–1)</string>
-  <string name="recurve_style_x_5">Recurve style (X–5)</string>
-  <string name="recurve_style_10_5">Recurve style (10–5)</string>
-  <string name="recurve_style_x_6">Recurve style (X–6)</string>
-  <string name="recurve_style_10_6">Recurve style (10–6)</string>
-  <string name="recurve_style_x_8">Recurve style (X–8)</string>
-  <string name="recurve_style_10_8">Recurve style (10–8)</string>
+  <string name="recurve_style_x_1">Style classique (X-1)</string>
+  <string name="recurve_style_10_1">Style classique (10-1)</string>
+  <string name="recurve_style_x_5">Style classique (X-5)</string>
+  <string name="recurve_style_10_5">Style classique (10-5)</string>
+  <string name="recurve_style_x_6">Style classique (X-6)</string>
+  <string name="recurve_style_10_6">Style classique (10-6)</string>
+  <string name="recurve_style_x_8">Style classique (X-8)</string>
+  <string name="recurve_style_10_8">Style classique (10-8)</string>
   <string name="compound_style">Compound style</string>
 </resources>