diff --git a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java
index 0e931076fac01e33754c7aea50570113e5de5c1d..2a6ef155e6f6f48f68851124d8d6225963d8a8a7 100644
--- a/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java
+++ b/testapp/src/main/java/org/mpisws/testapp/simulator/SimulationServerBT.java
@@ -107,7 +107,7 @@ public class SimulationServerBT {
         // Every "epoch" or so try to post link messages to the prior "epoch" ss for each "device"
         // Let's try and post to the prior 3 epochs
         Looper.prepare();
-        for (int loop = 0; loop < NUM_SIMULATED_EPOCHS; loop++) {
+        for (int loop = 1; loop <= NUM_SIMULATED_EPOCHS; loop++) {
             new Handler().postDelayed(() -> {
                 int lowEpoch = currentEpoch > 3 ? currentEpoch - 3 : 0;
                 List<Identifier> sses = sharedSecrets.subList(lowEpoch * NUM_SIMULATED_DEVICES, currentEpoch * NUM_SIMULATED_DEVICES);
@@ -135,7 +135,7 @@ public class SimulationServerBT {
                 currentEpoch++;
                 // heh hack
                 if (currentEpoch == NUM_SIMULATED_EPOCHS) currentEpoch--;
-            }, CHANGE_EPOCH_TIME);
+            }, loop*CHANGE_EPOCH_TIME);
         }
     }
 }
diff --git a/testapp/src/main/res/layout/activity_main.xml b/testapp/src/main/res/layout/activity_main.xml
index 1ab7d6cd753fc60076a8797a73bd1f0f04a3b2da..7359173223a0341fddd8854747e1c589218f3ef5 100644
--- a/testapp/src/main/res/layout/activity_main.xml
+++ b/testapp/src/main/res/layout/activity_main.xml
@@ -22,32 +22,32 @@
                 android:id="@+id/getGoogleToken"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Get Google Token"/>
+                android:text="UserAccount: Get Google Token"/>
             <Button
                 android:id="@+id/signIn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="EbC Sign In"/>
+                android:text="UserAccount: EbC Sign In"/>
             <Button
                 android:id="@+id/signOut"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="ES Sign Out" />
+                android:text="UserAccount: EbC Sign Out" />
             <Button
                 android:id="@+id/deleteAccount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="ES deleteAccount"/>
+                android:text="UserAccount: deleteAccount"/>
            <Button
                 android:id="@+id/testSendMessages"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Send message with all constraint" />
+                android:text="Messaging: Send message to all encounters" />
            <Button
                 android:id="@+id/testReceiveMessages"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Get unread messages" />
+                android:text="Messaging: Get unread messages" />
            <Button
                 android:id="@+id/simulateEncounterFormationAndConfirmationClient"
                 android:layout_width="wrap_content"
@@ -63,17 +63,17 @@
                 android:id="@+id/testWithoutConfirmation"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="testBLEWithoutConfirmation" />
+                android:text="EndToEnd: BLE without Confirmation" />
            <Button
                 android:id="@+id/testEndToEndES"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="testEndToEndES" />
+                android:text="EndToEnd: Confirmation using ES" />
            <Button
                 android:id="@+id/testEndToEndBLE"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="testEndToEndBLE" />
+               android:text="EndToEnd: Confirmation using BLE" />
         </LinearLayout>
     </ScrollView>
     </LinearLayout>