diff --git a/src/App.vue b/src/App.vue
index 6678b267..5d912417 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -590,21 +590,21 @@ export default {
         },
         {
           icon: 'history',
-          text: i18n.t('NotificationHistory'),
+          text: i18n.t('Notification History'),
           path: '/notificationhistory',
           perms: 'read:notification_history',
           show: true
         },
         {
           icon: 'av_timer',
-          text: i18n.t('NotificationDelay'),
+          text: i18n.t('Notification Delays'),
           path: '/notificationdelays',
           perms: 'read:notification_rules',
           show: true
         },
         {
           icon: 'arrow_upward',
-          text: i18n.t('EscalationRules'),
+          text: i18n.t('Escalation Rules'),
           path: '/escalationrules',
           perms: 'read:escalation_rules',
           show: true
@@ -639,14 +639,14 @@ export default {
         },
         {
           icon: 'people',
-          text: i18n.t('NotificationGroups'),
+          text: i18n.t('Notification Groups'),
           path: '/notificationgroups',
           perms: 'read:notification_groups',
           show: true
         },
         {
           icon: 'phone',
-          text: i18n.t('OnCall'),
+          text: i18n.t('On Call'),
           path: '/oncall',
           perms: 'read:notification_rules',
           show: true
@@ -667,14 +667,14 @@ export default {
         },
         {
           icon: 'notifications',
-          text: i18n.t('NotificationChannels'),
+          text: i18n.t('Notification Channels'),
           path: '/notificationchannels',
           perms: 'read:notification_channels',
           show: true
         },
         {
           icon: 'notifications',
-          text: i18n.t('NotificationRules'),
+          text: i18n.t('Notification Rules'),
           path: '/notificationrules',
           perms: 'read:notification_rules',
           show: true
diff --git a/src/components/EscalationRuleList.vue b/src/components/EscalationRuleList.vue
index 7ddc655a..af315114 100644
--- a/src/components/EscalationRuleList.vue
+++ b/src/components/EscalationRuleList.vue
@@ -248,7 +248,7 @@
 
     <v-card>
       <v-card-title class="title">
-        {{ $t('escalationRules') }}
+        {{ $t('Escalation Rules') }}
         <v-spacer />
         <v-btn-toggle
           v-model="status"
diff --git a/src/components/NotificationChannelList.vue b/src/components/NotificationChannelList.vue
index 9ea9374a..8df26d2d 100644
--- a/src/components/NotificationChannelList.vue
+++ b/src/components/NotificationChannelList.vue
@@ -235,7 +235,7 @@
 
     <v-card>
       <v-card-title class="title">
-        {{ $t('notificationChannels') }}
+        {{ $t('Notification Channels') }}
         <v-spacer />
         <v-tooltip bottom>
           <template slot="activator">
diff --git a/src/components/NotificationDelayList.vue b/src/components/NotificationDelayList.vue
index a254608f..31369ebe 100644
--- a/src/components/NotificationDelayList.vue
+++ b/src/components/NotificationDelayList.vue
@@ -2,7 +2,7 @@
   <div>
     <v-card>
       <v-card-title class="title">
-        {{ $t('notificationDelays') }}
+        {{ $t('Notification Delays') }}
       </v-card-title>
 
       <v-data-table
diff --git a/src/components/NotificationGroupList.vue b/src/components/NotificationGroupList.vue
index e1a8bbf3..6ebc8709 100644
--- a/src/components/NotificationGroupList.vue
+++ b/src/components/NotificationGroupList.vue
@@ -27,6 +27,24 @@
                   />
                 </v-flex>
 
+                <v-flex xs12>
+                  <v-combobox
+                    v-model="editedItem.phoneNumbers"
+                    :label="$t('PhoneNumbers')"
+                    chips
+                    multiple
+                  />
+                </v-flex>
+
+                <v-flex xs12>
+                  <v-combobox
+                    v-model="editedItem.mails"
+                    :label="$t('Mails')"
+                    chips
+                    multiple
+                  />
+                </v-flex>
+
                 <v-flex xs12>
                   <v-text-field
                     v-model="editedItem.name"
@@ -62,7 +80,7 @@
 
     <v-card>
       <v-card-title class="title">
-        {{ $t('notificationGroup') }}
+        {{ $t('Notification Groups') }}
       </v-card-title>
 
       <v-data-table
@@ -91,6 +109,26 @@
               {{ getName(users, user) }}
             </v-chip>
           </td>
+          <td>
+            <v-chip
+              v-for="number in props.item.phoneNumbers"
+              :key="number"
+              outline
+              small
+            >
+              {{ number }}
+            </v-chip>
+          </td>
+          <td>
+            <v-chip
+              v-for="mail in props.item.mails"
+              :key="mail"
+              outline
+              small
+            >
+              {{ mail }}
+            </v-chip>
+          </td>
           <td class="text-no-wrap">
             <v-btn
               v-has-perms.disable="'write:notification_groups'"
@@ -181,6 +219,14 @@ export default {
         text: i18n.t('Users'),
         value: 'users'
       },
+      {
+        text: i18n.t('Phone Numbers'),
+        value: 'phoneNumbers'
+      },
+      {
+        text: i18n.t('Mails'),
+        value: 'mails'
+      },
       {
         text: i18n.t('Actions'),
         value: 'name',
@@ -191,12 +237,16 @@ export default {
     editedItem: {
       name: null,
       users: [],
+      phoneNumbers: [],
+      mails: [],
     },
     menu1: false,
     menu2: false,
     defaultItem: {
       name: null,
       users: [],
+      phoneNumbers: [],
+      mails: [],
     },
     rules: {
       required: v => !!v || i18n.t('Required')
@@ -309,6 +359,8 @@ export default {
           {
             name: this.editedItem.name,
             users: this.editedItem.users,
+            phoneNumbers: this.editedItem.phoneNumbers,
+            mails: this.editedItem.mails
           }
         ])
       } else {
diff --git a/src/components/NotificationRuleList.vue b/src/components/NotificationRuleList.vue
index 0048ef25..6d9170b5 100644
--- a/src/components/NotificationRuleList.vue
+++ b/src/components/NotificationRuleList.vue
@@ -587,7 +587,7 @@
 
     <v-card>
       <v-card-title class="title">
-        {{ $t('notificationRules') }}
+        {{ $t('Notification Rules') }}
         <v-spacer />
         <span 
           v-if="selectableRows"
diff --git a/src/components/OnCallList.vue b/src/components/OnCallList.vue
index de650314..82e7fa75 100644
--- a/src/components/OnCallList.vue
+++ b/src/components/OnCallList.vue
@@ -265,7 +265,7 @@
 
     <v-card>
       <v-card-title class="title">
-        {{ $t('onCalls') }}
+        {{ $t('On Call') }}
         <v-spacer />
         <v-btn-toggle
           v-model="status"