diff --git a/app.js b/app.js
index e2faed7..b9dc0ed 100644
--- a/app.js
+++ b/app.js
@@ -183,10 +183,18 @@ var app = new Vue({
             deep: true
         }
     },
+    
+    computed: {
+        groupedTermine() {
+            return _.groupBy(this.shifts, e => e.Datum);
+        }
+    },
+
     methods: {
         updateArten(value){
             this.selectedRule.Arten = value;
         },
+
         updateTitel(value){
             this.selectedRule.Titel = value;
         },
diff --git a/index.html b/index.html
index 5bd859e..d0afa39 100644
--- a/index.html
+++ b/index.html
@@ -37,15 +37,15 @@
             </div>
         </nav>
         <ul class="sidenav" id="mobile-nav">
-            
+
         </ul>
         <div id="body">
             <main class="container">
                 <div id="termine">
                     
-                    <div class="card" v-if="shifts.length > 0">
-                        <div class="card-content">
-                            <h3 class="card-title">Termine</h3>
+                    <div class="" v-if="shifts.length > 0">
+                        <div class="">
+                            <h3 class="title">Termine</h3>
                             <table class="highlight" >
                                 <thead class="">
                                     <tr>
@@ -59,14 +59,14 @@
                                 <tbody>
                                     <tr v-for="s in shifts" :key="s.id" @click="selectShift(s)">
                                         <td class="text-xs-right align-middle">
-                                            {{s.FormattedDatum}}
+                                                {{s.FormattedDatum}}
                                         </td>
                                         <td class="">
                                             {{s.Wochentag}}
                                         </td>
                                         <td class="">
                                             {{s.VEventTitle}}
-                                            <small>{{ s.Ort }}</small>
+                                            <small v-if="s.Ort != ''"><i class="tiny material-icons red-text">location_on</i>{{ s.Ort }}</small>
                                         </td>
                                         <td class="" v-if="s.Beginn !== '00:00'">
                                             {{s.Beginn}} - {{s.Ende}}
@@ -254,6 +254,7 @@
         style="display:none;">
     </div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.11/lodash.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.14.1/xlsx.full.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.23.0/moment-with-locales.min.js"></script>
diff --git a/js/shift.js b/js/shift.js
index cd9fd2b..c24e024 100644
--- a/js/shift.js
+++ b/js/shift.js
@@ -265,7 +265,9 @@ Shift.thaw = function (jsonShift) {
             art: jsonShift._kind, 
             name: jsonShift._name, 
             datum: begin, 
-            beschreibung: jsonShift._description
+            beschreibung: jsonShift._description,
+            ort: jsonShift._ort,
+            
         });
     shift.id = jsonShift.id;
     shift.Dauer = moment.duration(jsonShift._duration);