diff --git a/ui/src/components/control/ControlGeneral.vue b/ui/src/components/control/ControlGeneral.vue
index 572da57c..68f5ace7 100644
--- a/ui/src/components/control/ControlGeneral.vue
+++ b/ui/src/components/control/ControlGeneral.vue
@@ -1,7 +1,7 @@
 <template>
     <span class="control-general">
         <span v-b-tooltip.hover
-              title="Immediately stop all robots">
+              :title="'Immediately stop all robots (' + Object.keys(keymapHalt)[0] + ')'">
             <b-button v-hotkey="keymapHalt"
                       v-on:click="send('halt')"
                       v-bind:disabled="halted">
@@ -9,7 +9,7 @@
             </b-button>
         </span>
         <span v-b-tooltip.hover
-              title="Robots have to keep distance to the ball">
+              :title="'Robots have to keep distance to the ball (' + Object.keys(keymapStop)[0] + ')'">
             <b-button v-hotkey="keymapStop"
                       v-on:click="send('stop')"
                       v-bind:disabled="stopped || !inNormalHalf">
@@ -17,7 +17,7 @@
             </b-button>
         </span>
         <span v-b-tooltip.hover
-              title="Restart the game in draw situations">
+              :title="'Restart the game in draw situations (' + Object.keys(keymapForceStart)[0] + ')'">
             <b-button v-hotkey="keymapForceStart"
                       v-on:click="send('forceStart')"
                       v-bind:disabled="!stopped || !inNormalHalf">
@@ -25,7 +25,7 @@
             </b-button>
         </span>
         <span v-b-tooltip.hover
-              title="Continue game after a prepare state">
+              :title="'Continue game after a prepare state (' + Object.keys(keymapNormalStart)[0] + ')'">
             <b-button v-hotkey="keymapNormalStart"
                       v-on:click="send('normalStart')"
                       v-bind:disabled="!prepareSth || !inNormalHalf">
diff --git a/ui/src/components/control/ControlTeam.vue b/ui/src/components/control/ControlTeam.vue
index 22027947..3a184229 100644
--- a/ui/src/components/control/ControlTeam.vue
+++ b/ui/src/components/control/ControlTeam.vue
@@ -2,7 +2,7 @@
     <div class="control-team">
         <h2>Team {{teamColor}}</h2>
         <span v-b-tooltip.hover
-              title="Prepare for a kickoff">
+              :title="'Prepare for a kickoff (' + Object.keys(keymapKickoff)[0] + ')'">
         <b-button v-hotkey="keymapKickoff"
                   v-on:click="send('kickoff')"
                   v-bind:disabled="halted || running || preparing">
@@ -10,7 +10,7 @@
         </b-button>
         </span>
         <span v-b-tooltip.hover
-              title="Perform direct kick (corner and goal kicks)">
+              :title="'Perform direct kick (corner and goal kicks) (' + Object.keys(keymapDirect)[0] + ')'">
         <b-button v-hotkey="keymapDirect"
                   v-on:click="send('direct')"
                   v-bind:disabled="halted || running || preparing">
@@ -18,7 +18,7 @@
         </b-button>
         </span>
         <span v-b-tooltip.hover
-              title="Perform indirect kick (throw-in)">
+              :title="'Perform indirect kick (throw-in) (' + Object.keys(keymapIndirect)[0] + ')'">
         <b-button v-hotkey="keymapIndirect"
                   v-on:click="send('indirect')"
                   v-bind:disabled="halted || running || preparing">
diff --git a/ui/src/components/team/TeamYellowCards.vue b/ui/src/components/team/TeamYellowCards.vue
index ae91d33a..7a7f9550 100644
--- a/ui/src/components/team/TeamYellowCards.vue
+++ b/ui/src/components/team/TeamYellowCards.vue
@@ -23,6 +23,7 @@
         <b-collapse id="collapseDurations" class="mt-2">
             <EditableLabelDuration
                     class="editable-label"
+                    v-bind:key="cardTime"
                     v-for="(cardTime, cardId) in yellowCardTimes"
                     :value="cardTime"
                     :callback="(v) => updateCardTime(v, cardId)"/>