diff --git a/client/src/assets/css/form.css b/client/src/assets/css/form.css
index 1e34d66..6fc9fb2 100644
--- a/client/src/assets/css/form.css
+++ b/client/src/assets/css/form.css
@@ -1,25 +1,26 @@
-.v-form {
-    padding-bottom: 60px;
-}
-
-.v-form h1 {
-    font-weight: normal;
-    margin: 20px;
-}
-
-.v-form h2 {
-    font-weight: normal;
-    margin: 10px 20px;
-}
-
-.v-form .v-text-field {
-    margin: 5px 20px;
-}
-
-.v-form .v-list {
-    padding: 0;
-}
-
-.v-list .v-text-field {
-    padding-top: 0;
-}
+:not(.v-card) > .v-form {
+    padding-bottom: 60px;
+}
+
+:not(.v-card) > .v-form h1 {
+    font-weight: normal;
+    margin: 20px;
+}
+
+:not(.v-card) > .v-form h2 {
+    font-weight: normal;
+    margin: 10px 20px;
+}
+
+:not(.v-card) > .v-form .v-text-field {
+    margin: 5px 20px;
+}
+
+:not(.v-card) > .v-form .v-list {
+    border-top: 1px solid #f0f0f0;
+    border-radius: 0;
+}
+
+:not(.v-card) > .v-form .v-list .v-text-field {
+    padding-top: 0;
+}
diff --git a/client/src/components/Auth.vue b/client/src/components/Auth.vue
index 5358c3d..2d10e27 100644
--- a/client/src/components/Auth.vue
+++ b/client/src/components/Auth.vue
@@ -10,6 +10,9 @@
             <p class="wrong" v-if="wrong">{{ $t("auth.wrong") }}</p>
           </v-slide-y-transition>
           <v-text-field v-model="input"
+                        outlined
+                        rounded
+                        hide-details
                         ref="input"
                         autocomplete="off"
                         @change="wrong = false"
@@ -25,7 +28,7 @@
           <v-btn text @click="dialog = false">
             {{ $t("button.cancel") }}
           </v-btn>
-          <v-btn text :loading="loading" color="primary" :disabled="!valid" type="submit">
+          <v-btn depressed color="primary" :loading="loading" :disabled="!valid" type="submit">
             {{ $t("button.ok") }}
           </v-btn>
         </v-card-actions>
@@ -110,10 +113,6 @@ export default {
 </script>
 
 <style scoped>
-.v-form {
-  padding: 0;
-}
-
 .wrong {
   color: red;
 }
diff --git a/client/src/components/RoundSummary.vue b/client/src/components/RoundSummary.vue
new file mode 100644
index 0000000..3c2f214
--- /dev/null
+++ b/client/src/components/RoundSummary.vue
@@ -0,0 +1,57 @@
+<template>
+  <v-list>
+    <v-list-item v-for="(amount, name) in round.consumers" :key="name">
+      <v-list-item-content>
+        <v-list-item-title>
+          {{ name }}
+        </v-list-item-title>
+      </v-list-item-content>
+      <v-list-item-action class="amount">
+        {{ amount }} &times; {{ (parseFloat(round.price) / 100).toFixed(2) }}
+      </v-list-item-action>
+    </v-list-item>
+
+    <v-divider></v-divider>
+
+    <v-list-item>
+      <v-list-item-content>
+        <v-list-item-title class="total">
+          {{ $t("rounds.dialog.total") }}
+        </v-list-item-title>
+      </v-list-item-content>
+      <v-list-item-action class="amount">
+        {{ drinksCount }}
+        &times; {{ (parseFloat(round.price) / 100).toFixed(2) }}
+        = {{ (parseFloat(totalPrice) / 100).toFixed(2) }}
+      </v-list-item-action>
+    </v-list-item>
+  </v-list>
+</template>
+
+<script>
+export default {
+    name: "RoundSummary",
+    props: {
+        round: Object
+    },
+    computed: {
+        drinksCount() {
+            return Object.values(this.round.consumers).reduce((a, b) => a + b);
+        },
+        totalPrice() {
+            return this.drinksCount * this.round.price
+        }
+    }
+}
+</script>
+
+<style scoped>
+.total {
+  font-weight: bold;
+}
+
+.amount {
+  text-align: right;
+  font-weight: bold;
+}
+</style>
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index db41341..6675ee2 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -65,13 +65,22 @@
     "title": "Round payed by {0}",
     "subtitle": "Consumers",
     "price": {
-      "label": "Price"
+      "label": "Price",
+      "total": "Total"
+    },
+    "dialog": {
+      "title": "Confirm payment?"
+    },
+    "description": {
+      "label": "Add a note..."
     }
   },
   "rounds": {
     "title": "Rounds history",
-    "filter": "Search...",
     "none": "No rounds found",
+    "filter": {
+      "label": "Search..."
+    },
     "dialog": {
       "title": "Round payed by {0}",
       "total": "Total"
diff --git a/client/src/locales/fr.json b/client/src/locales/fr.json
index 8dc1a09..cf4936d 100644
--- a/client/src/locales/fr.json
+++ b/client/src/locales/fr.json
@@ -65,13 +65,22 @@
     "title": "Tournée payée par {0}",
     "subtitle": "Consommateurs",
     "price": {
-      "label": "Prix"
+      "label": "Prix",
+      "total": "Total"
+    },
+    "dialog": {
+      "title": "Confirmer le paiement ?"
+    },
+    "description": {
+      "label": "Ajouter une note..."
     }
   },
   "rounds": {
     "title": "Historique des tournées",
-    "filter": "Rechercher...",
     "none": "Aucune tournée trouvée",
+    "filter": {
+      "label": "Rechercher..."
+    },
     "dialog": {
       "title": "Tournée payée par {0}",
       "total": "Total"
diff --git a/client/src/views/Edit.vue b/client/src/views/Edit.vue
index ef48d24..3dbcb91 100644
--- a/client/src/views/Edit.vue
+++ b/client/src/views/Edit.vue
@@ -181,6 +181,7 @@ export default {
   left: 0;
   width: 100%;
   background: #eee;
+  border-radius: 0;
 }
 
 .v-btn:hover {
@@ -194,4 +195,8 @@ export default {
 .new-pass {
   margin-left: 20px;
 }
+
+.v-list {
+  margin-top: 10px;
+}
 </style>
diff --git a/client/src/views/Pay.vue b/client/src/views/Pay.vue
index 00c8795..24d6abe 100644
--- a/client/src/views/Pay.vue
+++ b/client/src/views/Pay.vue
@@ -1,64 +1,100 @@
 <template>
-  <v-form v-model="valid" @submit.prevent="submit">
-    <h1>{{ $t("pay.title", [$route.params.payer]) }}</h1>
-    <div class="price-row">
-      <div>
-        <v-text-field class="price"
-                      v-model="price"
-                      :rules="[required, positive]"
-                      type="number"
-                      :autofocus="!price"
-                      outlined
-                      rounded
-                      single-line
-                      reverse
-                      :suffix="$t('pay.price.label')"
-        ></v-text-field>
+  <div>
+    <v-dialog v-model="dialog" width="500">
+      <v-card>
+        <v-form @submit.prevent="submit">
+          <v-card-title class="headline" primary-title>
+            {{ $t("pay.dialog.title") }}
+          </v-card-title>
+          <v-card-text>
+            <RoundSummary :round="round"/>
+            <v-text-field v-model="description"
+                          outlined
+                          rounded
+                          hide-details
+                          dense
+                          :placeholder="$t('pay.description.label')"
+            ></v-text-field>
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn text @click="dialog = false">
+              {{ $t("button.cancel") }}
+            </v-btn>
+            <v-btn depressed color="primary" type="submit">
+              {{ $t("button.ok") }}
+            </v-btn>
+          </v-card-actions>
+        </v-form>
+      </v-card>
+    </v-dialog>
+
+    <v-form v-model="valid" @submit.prevent="confirm">
+      <h1>{{ $t("pay.title", [$route.params.payer]) }}</h1>
+      <div class="price-row">
+        <div>
+          <v-text-field class="price"
+                        v-model="price"
+                        :rules="[required, positive]"
+                        type="number"
+                        :autofocus="!price"
+                        outlined
+                        rounded
+                        single-line
+                        reverse
+                        :suffix="$t('pay.price.label')"
+          ></v-text-field>
+        </div>
+        <v-switch v-model="total" class="total" color="primary" inset :label="$t('pay.price.total')"/>
       </div>
-      <v-switch v-model="total" class="total" color="primary" inset label="Total"/>
-    </div>
-
-    <h2>{{ $t("pay.subtitle") }}</h2>
-    <v-list v-if="group">
-      <v-list-item v-for="(member, i) in group.members" :key="i">
-        <v-list-item-content>
-          <v-list-item-title>{{ member.name }}</v-list-item-title>
-        </v-list-item-content>
-
-        <v-list-item-action class="amount-buttons">
-          <span v-if="consumers[member.name]" class="cost">{{ memberCost(member.name).toFixed(2) }}</span>
-          <v-btn icon ripple
-                 @click="--consumers[member.name]"
-                 :disabled="consumers[member.name] < 1">
-            <v-icon large color="primary">mdi-minus-circle</v-icon>
-          </v-btn>
-          <span class="amount">{{ consumers[member.name] }}</span>
-          <v-btn icon ripple
-                 @click="++consumers[member.name]">
-            <v-icon large color="primary">mdi-plus-circle</v-icon>
-          </v-btn>
-        </v-list-item-action>
-      </v-list-item>
-    </v-list>
-    <Buttons :text="$t('button.pay') + ' ' + totalPrice.toFixed(2)"
-             :valid="valid && enoughConsumers"/>
-  </v-form>
+
+      <h2>{{ $t("pay.subtitle") }}</h2>
+      <v-list v-if="group">
+        <v-list-item v-for="(member, i) in group.members" :key="i">
+          <v-list-item-content>
+            <v-list-item-title>{{ member.name }}</v-list-item-title>
+          </v-list-item-content>
+
+          <v-list-item-action class="amount-buttons">
+            <span v-if="consumers[member.name]" class="cost">{{ memberCost(member.name).toFixed(2) }}</span>
+            <v-btn icon ripple
+                   @click="--consumers[member.name]"
+                   :disabled="consumers[member.name] < 1">
+              <v-icon large color="primary">mdi-minus-circle</v-icon>
+            </v-btn>
+            <span class="amount">{{ consumers[member.name] }}</span>
+            <v-btn icon ripple
+                   @click="++consumers[member.name]">
+              <v-icon large color="primary">mdi-plus-circle</v-icon>
+            </v-btn>
+          </v-list-item-action>
+        </v-list-item>
+      </v-list>
+      <Buttons :text="$t('button.pay') + ' ' + totalPrice.toFixed(2)"
+               :valid="valid && enoughConsumers"/>
+    </v-form>
+  </div>
 </template>
 
 <script>
 import "@/assets/css/form.css"
 import Buttons from "@/components/Buttons";
 import {mapActions, mapState, mapMutations} from "vuex";
+import RoundSummary from "@/components/RoundSummary";
 
 export default {
     name: "Pay",
-    components: {Buttons},
+    components: {RoundSummary, Buttons},
     data() {
         return {
             valid: false,
             price: null,
             total: false,
             consumers: {},
+            description: null,
+
+            dialog: false,
+            round: {},
 
             required: value => !!value || this.$t("validation.required"),
             positive: value => value >= 0.01 || this.$t("validation.positive"),
@@ -82,12 +118,7 @@ export default {
         ...mapMutations(["onRefresh", "setTitle"]),
 
         async submit() {
-            const price = Math.round(this.price * 100 / (this.total ? this.totalAmount : 1));
-            const data = {
-                payer: this.$route.params.payer,
-                price: price,
-                consumers: this.consumers
-            };
+            this.dialog = false;
 
             localStorage.setItem("price", (this.price * 100).toFixed(0));
             if (this.total)
@@ -95,9 +126,28 @@ export default {
             else
                 localStorage.removeItem("total");
 
-            await this.postRound({id: this.$route.params.id, rounds: data});
+            if (this.description)
+                this.round.description = this.description;
+
+            await this.postRound({id: this.$route.params.id, rounds: this.round});
             this.$router.go(-1);
         },
+        confirm() {
+            const price = Math.round(this.price * 100 / (this.total ? this.totalAmount : 1));
+            this.round = {
+                payer: this.$route.params.payer,
+                price: price,
+                consumers: {}
+            };
+
+            // remove consumers with no drinks
+            Object.assign(this.round.consumers, this.consumers);
+            for (const member of Object.keys(this.round.consumers))
+                if (this.round.consumers[member] < 1)
+                    delete this.round.consumers[member];
+
+            this.dialog = true;
+        },
 
         memberCost(name) {
             return this.price * this.consumers[name] / (this.total ? this.totalAmount : 1);
@@ -127,6 +177,10 @@ export default {
 </script>
 
 <style scoped>
+.headline {
+  word-break: normal;
+}
+
 .price-row {
   display: flex;
   justify-content: space-evenly;
diff --git a/client/src/views/Rounds.vue b/client/src/views/Rounds.vue
index 2640a7e..aa711ff 100644
--- a/client/src/views/Rounds.vue
+++ b/client/src/views/Rounds.vue
@@ -5,35 +5,22 @@
         <v-card-title class="headline" primary-title>
           {{ $t("rounds.dialog.title", [selectedRound.payer]) }}
         </v-card-title>
-        <v-card-text>
-          <v-list>
-            <v-list-item v-for="(amount, name) in selectedRound.consumers" :key="name">
-              <v-list-item-content>
-                <v-list-item-title>
-                  {{ name }}
-                </v-list-item-title>
-              </v-list-item-content>
-              <v-list-item-action class="amount">
-                {{ amount }} &times; {{ (parseFloat(selectedRound.price) / 100).toFixed(2) }}
-              </v-list-item-action>
-            </v-list-item>
-
-            <v-divider></v-divider>
-
-            <v-list-item>
-              <v-list-item-content>
-                <v-list-item-title class="total">
-                  {{ $t("rounds.dialog.total") }}
-                </v-list-item-title>
-              </v-list-item-content>
-              <v-list-item-action class="amount">
-                {{ selectedRound.drinksCount }}
-                &times; {{ (parseFloat(selectedRound.price) / 100).toFixed(2) }}
-                = {{ (parseFloat(selectedRound.totalPrice) / 100).toFixed(2) }}
-              </v-list-item-action>
-            </v-list-item>
-          </v-list>
+
+        <v-card-subtitle class="dialog-subtitle">
+          <div class="subtitle-row">
+            <v-icon small>mdi-calendar</v-icon>
+            <span>{{ selectedRound.date | moment("LL, H:mm") }}</span>
+          </div>
+          <div class="subtitle-row" v-if="selectedRound.description">
+            <v-icon small>mdi-card-text-outline</v-icon>
+            <span>{{ selectedRound.description }}</span>
+          </div>
+        </v-card-subtitle>
+
+        <v-card-text class="dialog-content">
+          <RoundSummary :round="selectedRound"/>
         </v-card-text>
+
         <v-card-actions>
           <v-spacer></v-spacer>
           <v-btn text @click="dialog = false">
@@ -65,7 +52,7 @@
             <v-text-field
               ref="input"
               v-model="filter"
-              :placeholder="$t('rounds.filter')"
+              :placeholder="$t('rounds.filter.label')"
               hide-details
               dense
               outlined
@@ -83,7 +70,7 @@
             {{ round.date | moment("dddd, LL") }}
           </v-subheader>
 
-          <v-list-item :class="{ deleted: round.deleted }">
+          <v-list-item :class="{ deleted: round.deleted, large: round.description }">
 
             <v-list-item-content class="round">
               <v-list-item-title class="round-title">
@@ -93,8 +80,14 @@
                   {{ drinksCount(round) }} &times; {{ (parseFloat(round.price) / 100).toFixed(2) }}
                 </span>
               </v-list-item-title>
-              <v-list-item-subtitle>
-                <v-icon class="time-icon">mdi-clock-outline</v-icon>
+
+              <v-list-item-subtitle class="subtitle" v-if="round.description">
+                <v-icon class="subtitle-icon">mdi-card-text-outline</v-icon>
+                <span>{{ round.description }}</span>
+              </v-list-item-subtitle>
+
+              <v-list-item-subtitle class="subtitle">
+                <v-icon class="subtitle-icon">mdi-clock-outline</v-icon>
                 <span>{{ round.date | moment("H:mm") }}</span>
               </v-list-item-subtitle>
             </v-list-item-content>
@@ -133,10 +126,11 @@
 import "@/assets/css/form.css"
 import Buttons from "@/components/Buttons"
 import {mapActions, mapState, mapMutations, mapGetters} from "vuex";
+import RoundSummary from "@/components/RoundSummary";
 
 export default {
     name: "Rounds",
-    components: {Buttons},
+    components: {RoundSummary, Buttons},
     data: () => ({
         changedRounds: [],
         selectedRound: null,
@@ -183,8 +177,6 @@ export default {
 
         showConsumers(round) {
             this.selectedRound = round;
-            this.selectedRound.drinksCount = this.drinksCount(round);
-            this.selectedRound.totalPrice = this.selectedRound.drinksCount * round.price;
             this.dialog = true;
         },
         drinksCount(round) {
@@ -235,7 +227,7 @@ export default {
   justify-content: space-between;
 }
 
-h1 {
+.v-form h1 {
   margin: 0;
 }
 
@@ -243,17 +235,33 @@ h1 {
   word-break: normal;
 }
 
-.v-list {
-  padding: 0;
+.dialog-subtitle {
+  background-color: whitesmoke;
+  border-radius: 4px;
+  margin: 0 20px;
+  padding: 0 0 10px;
+  font-size: 1.1em;
+}
+
+.subtitle-row {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: start;
+  padding: 10px 10px 0;
+}
+
+.dialog-subtitle .v-icon {
+  margin-right: 4px;
+  padding: 3px 6px;
 }
 
-.total {
-  font-weight: bold;
+.v-card .dialog-content {
+  padding-bottom: 0;
 }
 
-.amount {
-  text-align: right;
-  font-weight: bold;
+.v-form .v-list {
+  padding: 0;
+  border-top: none;
 }
 
 .round {
@@ -269,7 +277,18 @@ h1 {
   line-height: 0.9;
 }
 
-.time-icon {
+.subtitle {
+  display: flex;
+  align-items: center;
+}
+
+.subtitle > span {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.subtitle-icon {
   font-size: 0.9em;
   line-height: 1.5;
   margin-right: 4px;
@@ -279,6 +298,10 @@ h1 {
   background-color: whitesmoke;
 }
 
+.large {
+  min-height: 80px;
+}
+
 .deleted .round-title .round-payer,
 .deleted .round-title .round-drinks {
   color: grey;