diff --git a/src/app/login/login.page.ts b/src/app/login/login.page.ts
index 784e532..110df6c 100644
--- a/src/app/login/login.page.ts
+++ b/src/app/login/login.page.ts
@@ -29,6 +29,7 @@ export class LoginPage implements OnInit {
       username: new FormControl('', Validators.required),
       password: new FormControl('', Validators.required),
     });
+    this.loading = false;
   }
 
   login() {
@@ -48,10 +49,6 @@ export class LoginPage implements OnInit {
     });
   }
 
-  signUp() {
-    this.router.navigate(['register']);
-  }
-
   async showError(message: string) {
     const toast = await this.toastController.create({
       message: message,
diff --git a/src/app/map/map.page.html b/src/app/map/map.page.html
index ec3287d..e7535b8 100644
--- a/src/app/map/map.page.html
+++ b/src/app/map/map.page.html
@@ -5,14 +5,27 @@
   <app-search [class.mobile]="utilService.isMobile()" (setLocation)="zoomToLocation($event)"></app-search>
 </ion-content>
 
+<div id="legend">
+  <div class="legend-item">
+    <div class="color" [style.background-color]="getFeatureColors(true)[0]" [style.border-color]="getFeatureColors(true)[1]"></div>
+    <span>Your vineyards</span>
+  </div>
+  <div class="legend-item">
+    <div class="color" [style.background-color]="getFeatureColors(false)[0]" [style.border-color]="getFeatureColors(false)[1]"></div>
+    <span>Shared vineyards</span>
+  </div>
+</div>
+
 <div id="clickPopup" class="ol-popup">
   <a href="#" id="popup-closer" class="ol-popup-closer" (click)="closeClickPopup()"></a>
   <div [innerHTML]="clickText"></div>
 </div>
 <div id="popup" class="ol-popup">
-  <a href="#" id="popup-closer" class="ol-popup-closer" (click)="closePopup()"></a>
   <div id="popup-content">
-    <div class="title">{{activeVineyard?.name}}</div>
+    <div class="title">
+      {{activeVineyard?.name}}
+      <div *ngIf="activeVineyard?.shared" class="chip" [style.background-color]="getFeatureColors(true)[1]">Shared</div>
+    </div>
     <div class="row">
       <div class="icon">
         <ion-icon name="home-outline"></ion-icon>
@@ -52,7 +65,7 @@
     </div>
   </div>
 </div>
-<ion-fab vertical="bottom" horizontal="start" slot="fixed">
+<ion-fab [vertical]="utilService.isMobile() ? 'center' : 'bottom'" horizontal="start" slot="fixed">
   <ion-fab-button href="https://github.com/JanssenBrm/vineyards/issues/new?template=bug_report.md'">
     <ion-icon name="bug-outline"></ion-icon>
   </ion-fab-button>
diff --git a/src/app/map/map.page.scss b/src/app/map/map.page.scss
index 39875e4..5c93b2e 100644
--- a/src/app/map/map.page.scss
+++ b/src/app/map/map.page.scss
@@ -1,82 +1,129 @@
 #map {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .ol-popup {
-    position: absolute;
-    background-color: white;
-    box-shadow: 0 1px 4px rgba(0,0,0,0.2);
-    color: black;
-    padding: 1rem;
-    border-radius: 10px;
-    border: 1px solid #cccccc;
-    bottom: 12px;
-    left: -50px;
-    min-width: 280px;
-  }
-  .ol-popup:after, .ol-popup:before {
-    top: 100%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-  }
-  .ol-popup:after {
-    border-top-color: white;
-    border-width: 10px;
-    left: 48px;
-    margin-left: -10px;
-  }
-  .ol-popup:before {
-    border-top-color: #cccccc;
-    border-width: 11px;
-    left: 48px;
-    margin-left: -11px;
-  }
-  .ol-popup-closer {
-    text-decoration: none;
-    position: absolute;
-    top: .5rem;
-    right: .5rem;
+  position: absolute;
+  background-color: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
+  color: black;
+  padding: 1rem;
+  border-radius: 10px;
+  border: 1px solid #cccccc;
+  bottom: 12px;
+  left: -50px;
+  min-width: 280px;
+}
+
+.ol-popup:after, .ol-popup:before {
+  top: 100%;
+  border: solid transparent;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+}
+
+.ol-popup:after {
+  border-top-color: white;
+  border-width: 10px;
+  left: 48px;
+  margin-left: -10px;
+}
+
+.ol-popup:before {
+  border-top-color: #cccccc;
+  border-width: 11px;
+  left: 48px;
+  margin-left: -11px;
+}
+
+.ol-popup-closer {
+  text-decoration: none;
+  position: absolute;
+  top: .5rem;
+  right: .5rem;
+}
+
+.ol-popup-closer:after {
+  content: "✖";
+}
+
+#popup-content {
+  font-size: smaller;
+
+  .title {
+    font-weight: bold;
+    margin-bottom: .5rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .chip {
+      color: white;
+      padding: .25rem 0.5rem;
+      border-radius: var(--ion-border-radius);
+
+    }
   }
-  .ol-popup-closer:after {
-    content: "✖";
+
+  .row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: .25rem;
+
+    .icon {
+      margin-right: .5rem;
+      color: #9c9c9c
+    }
+
+    .actions {
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+      justify-content: flex-end;
+    }
   }
 
-  #popup-content {
-      font-size: smaller;
-
-      .title {
-          font-weight: bold;
-          margin-bottom: .5rem;
-      }
-      .row {
-          display: flex;
-          flex-direction: row;
-          align-items: center;
-          margin-bottom: .25rem;
-
-          .icon {
-              margin-right: .5rem;
-              color: #9c9c9c
-          }
-          .actions {
-              display: flex;
-              flex-direction: row;
-              width: 100%;
-              justify-content: flex-end;
-          }
-      }
-      .col {
-          display: flex;
-          flex-direction: column;
-      }
+  .col {
+    display: flex;
+    flex-direction: column;
   }
+}
 
 
 ion-fab-button {
   margin-top: .5rem;
+}
+
+
+#legend {
+  position: absolute;
+  right: calc(1rem + 2px);
+  top: 10rem;
+  background-color: white;
+  padding: 1rem;
+  border-radius: var(--ion-border-radius);
+  font-size: smaller;
+  display: flex;
+  flex-direction: column;
+
+  .legend-item {
+    display: flex;
+    align-items: center;
+    margin: 0.25rem 0;
+
+    .color {
+      height: 24px;
+      width: 24px;
+      border-width: 2px;
+      border-style: solid;
+      margin-right: 1rem;
+
+    }
+
+  }
 }
\ No newline at end of file
diff --git a/src/app/map/map.page.ts b/src/app/map/map.page.ts
index 70b44b3..76be374 100644
--- a/src/app/map/map.page.ts
+++ b/src/app/map/map.page.ts
@@ -33,6 +33,7 @@ import { ModalController } from '@ionic/angular';
 import { AddVineyardComponent } from './addvineyard/addvineyard.component';
 import { ConfirmComponent } from '../shared/components/confirm/confirm.component';
 import { NON_PREMIUM_ROLES } from '../models/userdata.model';
+import { Fill, Stroke, Style } from 'ol/style';
 
 @Component({
   selector: 'app-map',
@@ -368,8 +369,21 @@ export class MapPage implements OnInit, AfterViewInit {
     }
   }
 
-  private _getSnapInteraction(): Snap {
-    return new Snap({ source: this._featureLayer.getSource() });
+  private _getFeatureStyle(feature: Feature): Style {
+    const [fill, stroke] = this.getFeatureColors(feature.get('shared'));
+    return new Style({
+      fill: new Fill({
+        color: fill,
+      }),
+      stroke: new Stroke({
+        color: stroke,
+        width: 2,
+      }),
+    });
+  }
+
+  public getFeatureColors(shared: boolean): [string, string] {
+    return shared ? ['rgba(193,95,232,0.5)', 'rgb(175,86,210)'] : ['rgba(95, 118, 232, 0.5)', 'rgb(86,107,210)'];
   }
 
   private _getFeatureLayer(): VectorLayer {
@@ -378,6 +392,7 @@ export class MapPage implements OnInit, AfterViewInit {
       source: new VectorSource({
         features: [],
       }),
+      style: (feature) => this._getFeatureStyle(feature),
     });
   }
 
@@ -403,6 +418,7 @@ export class MapPage implements OnInit, AfterViewInit {
                   geometry: v.location,
                   name: v.id,
                   title: v.name,
+                  shared: v.shared,
                 })
             )
           );
@@ -432,10 +448,6 @@ export class MapPage implements OnInit, AfterViewInit {
       });
   }
 
-  logout() {
-    this.authService.logout();
-  }
-
   zoomToLocation(extent: number[]) {
     this.view.fit(buffer(transformExtent(extent, 'EPSG:4326', 'EPSG:3857'), 100));
   }
diff --git a/src/app/models/vineyard.model.ts b/src/app/models/vineyard.model.ts
index 12acd45..e6bec0d 100644
--- a/src/app/models/vineyard.model.ts
+++ b/src/app/models/vineyard.model.ts
@@ -19,7 +19,15 @@ export interface MeteoStatEntry {
 export interface MeteoStats {
   data: MeteoStatEntry[];
 }
-export interface Vineyard {
+
+export enum VineyardPermissions {
+  NONE,
+  VIEW,
+  EDIT,
+  OWNER,
+}
+
+export interface VineyardBase {
   id?: string;
   name: string;
   address?: string;
@@ -28,3 +36,10 @@ export interface Vineyard {
   varieties: Variety[];
   meteo: MeteoStats;
 }
+
+export interface Vineyard extends VineyardBase {
+  shared: boolean;
+  permissions: VineyardPermissions;
+  owner: string;
+  ownerName?: string;
+}
diff --git a/src/app/models/vineyarddoc.model.ts b/src/app/models/vineyarddoc.model.ts
index 23c2b67..9367709 100644
--- a/src/app/models/vineyarddoc.model.ts
+++ b/src/app/models/vineyarddoc.model.ts
@@ -1,5 +1,13 @@
-import { Vineyard } from './vineyard.model';
+import { VineyardBase, VineyardPermissions } from './vineyard.model';
 
-export interface VineyardDoc extends Vineyard {
+export interface VineyardDoc extends VineyardBase {
   location: string;
 }
+
+export interface VineyardPermissionsDoc {
+  permissions: VineyardPermissions;
+}
+export interface SharedVineyardDoc {
+  user: string;
+  vineyard: string;
+}
diff --git a/src/app/services/action.service.ts b/src/app/services/action.service.ts
index fbf1822..f635ac0 100644
--- a/src/app/services/action.service.ts
+++ b/src/app/services/action.service.ts
@@ -1,32 +1,20 @@
 import { Injectable } from '@angular/core';
-import { AngularFirestore, AngularFirestoreCollection, DocumentChangeAction } from '@angular/fire/firestore';
+import { AngularFirestore, DocumentChangeAction } from '@angular/fire/firestore';
 import { Vineyard } from '../models/vineyard.model';
-import { VineyardDoc } from '../models/vineyarddoc.model';
-import { map } from 'rxjs/operators';
-import { BehaviorSubject } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+import { BehaviorSubject, of } from 'rxjs';
 import { Action, ACTION_COLORS, ActionType, BaseAction, BaseActionDoc } from '../models/action.model';
-import { User } from 'firebase';
-import { AuthService } from './auth.service';
 import { UtilService } from './util.service';
 import * as moment from 'moment';
 
-export const ACTION_COLLECTION = 'actions';
-
 @Injectable({
   providedIn: 'root',
 })
 export class ActionService {
-  private _vineyardCollection: AngularFirestoreCollection<VineyardDoc>;
-
   private _actions: BehaviorSubject<Action[]>;
 
-  constructor(private fireStore: AngularFirestore, private authService: AuthService) {
+  constructor(private fireStore: AngularFirestore) {
     this._actions = new BehaviorSubject<Action[]>([]);
-    this.authService.getUser().subscribe((user: User) => {
-      if (user) {
-        this._vineyardCollection = fireStore.collection<VineyardDoc>(`users/${user.uid}/vineyards`);
-      }
-    });
   }
 
   public getActionListener(): BehaviorSubject<Action[]> {
@@ -34,9 +22,8 @@ export class ActionService {
   }
 
   public async addAction(vineyard: Vineyard, action: BaseAction): Promise<Action> {
-    const doc = await this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<BaseActionDoc>(ACTION_COLLECTION)
+    const doc = await this.fireStore
+      .collection<BaseActionDoc>(this.getVineyardActionsCollectionPath(vineyard))
       .add(this.convertToDoc(action));
     return {
       ...action,
@@ -46,9 +33,8 @@ export class ActionService {
   }
 
   public async updateAction(vineyard: Vineyard, action: BaseAction): Promise<Action> {
-    await this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<BaseActionDoc>(ACTION_COLLECTION)
+    await this.fireStore
+      .collection<BaseActionDoc>(this.getVineyardActionsCollectionPath(vineyard))
       .doc(action.id)
       .set(this.convertToDoc(action));
     return {
@@ -57,6 +43,10 @@ export class ActionService {
     };
   }
 
+  private getVineyardActionsCollectionPath(vineyard: Vineyard): string {
+    return `users/${vineyard.owner}/vineyards/${vineyard.id}/actions`;
+  }
+
   private convertToDoc(action: BaseAction): BaseActionDoc {
     return {
       ...action,
@@ -65,17 +55,15 @@ export class ActionService {
   }
 
   public async removeAction(vineyard: Vineyard, action: BaseAction): Promise<void> {
-    await this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<BaseActionDoc>(ACTION_COLLECTION)
+    await this.fireStore
+      .collection<BaseActionDoc>(this.getVineyardActionsCollectionPath(vineyard))
       .doc(action.id)
       .delete();
   }
 
   public getActions(vineyard: Vineyard): void {
-    this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<BaseActionDoc>(ACTION_COLLECTION)
+    this.fireStore
+      .collection<BaseActionDoc>(this.getVineyardActionsCollectionPath(vineyard))
       .snapshotChanges()
       .pipe(
         map((data: DocumentChangeAction<BaseActionDoc>[]) =>
@@ -98,7 +86,11 @@ export class ActionService {
             ...a,
             html: UtilService.parseMarkdown(a.description),
           }))
-        )
+        ),
+        catchError((error: any) => {
+          console.error(`Could not fetch actions from vineyard ${vineyard.id}`, error);
+          return of([]);
+        })
       )
       .subscribe((actions: Action[]) => this._actions.next(actions));
   }
diff --git a/src/app/services/notes.service.ts b/src/app/services/notes.service.ts
index 9321b46..d6c5483 100644
--- a/src/app/services/notes.service.ts
+++ b/src/app/services/notes.service.ts
@@ -1,45 +1,34 @@
 import { Injectable } from '@angular/core';
-import { AngularFirestore, AngularFirestoreCollection, DocumentChangeAction } from '@angular/fire/firestore';
-import { VineyardDoc } from '../models/vineyarddoc.model';
+import { AngularFirestore, DocumentChangeAction } from '@angular/fire/firestore';
 import { BehaviorSubject } from 'rxjs';
 import { Vintage } from '../models/vintage.model';
 import { Note, NoteBase, NoteBaseDoc } from '../models/note.model';
 import { Vineyard } from '../models/vineyard.model';
 import { map } from 'rxjs/operators';
-import { VINTAGE_COLLECTION } from './vintage.service';
-import { User } from 'firebase';
-import { AuthService } from './auth.service';
 import { UtilService } from './util.service';
 import * as moment from 'moment';
 
-export const NOTE_COLLECTION = 'notes';
 @Injectable({
   providedIn: 'root',
 })
 export class NotesService {
-  private _vineyardCollection: AngularFirestoreCollection<VineyardDoc>;
-
   private _notes: BehaviorSubject<Note[]>;
 
-  constructor(private fireStore: AngularFirestore, private authService: AuthService) {
+  constructor(private fireStore: AngularFirestore) {
     this._notes = new BehaviorSubject<Note[]>([]);
-    this.authService.getUser().subscribe((user: User) => {
-      if (user) {
-        this._vineyardCollection = fireStore.collection<VineyardDoc>(`users/${user.uid}/vineyards`);
-      }
-    });
   }
 
   public getNotesListener(): BehaviorSubject<Note[]> {
     return this._notes;
   }
 
+  private getVinetageNotesCollectionPath(vineyard: Vineyard, vinetage: Vintage): string {
+    return `users/${vineyard.owner}/vineyards/${vineyard.id}/vintages/${vinetage.id}/notes`;
+  }
+
   public async addNote(vineyard: Vineyard, vintage: Vintage, note: NoteBase): Promise<Note> {
-    const doc = await this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<Vintage>(VINTAGE_COLLECTION)
-      .doc(vintage.id)
-      .collection<NoteBaseDoc>(NOTE_COLLECTION)
+    const doc = await this.fireStore
+      .collection<NoteBaseDoc>(this.getVinetageNotesCollectionPath(vineyard, vintage))
       .add(this.convertToDoc(note));
 
     return {
@@ -50,11 +39,8 @@ export class NotesService {
   }
 
   public async updateNote(vineyard: Vineyard, vintage: Vintage, note: NoteBase): Promise<Note> {
-    await this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<Vintage>(VINTAGE_COLLECTION)
-      .doc(vintage.id)
-      .collection<NoteBaseDoc>(NOTE_COLLECTION)
+    await this.fireStore
+      .collection<NoteBaseDoc>(this.getVinetageNotesCollectionPath(vineyard, vintage))
       .doc(note.id)
       .set(this.convertToDoc(note));
 
@@ -72,21 +58,15 @@ export class NotesService {
   }
 
   public async removeNote(vineyard: Vineyard, vintage: Vintage, note: NoteBase): Promise<void> {
-    await this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<Vintage>(VINTAGE_COLLECTION)
-      .doc(vintage.id)
-      .collection<NoteBaseDoc>(NOTE_COLLECTION)
+    await this.fireStore
+      .collection<NoteBaseDoc>(this.getVinetageNotesCollectionPath(vineyard, vintage))
       .doc(note.id)
       .delete();
   }
 
   public getNotes(vineyard: Vineyard, vintage: Vintage): void {
-    this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<Vintage>(VINTAGE_COLLECTION)
-      .doc(vintage.id)
-      .collection<NoteBaseDoc>(NOTE_COLLECTION)
+    this.fireStore
+      .collection<NoteBaseDoc>(this.getVinetageNotesCollectionPath(vineyard, vintage))
       .snapshotChanges()
       .pipe(
         map((data: DocumentChangeAction<NoteBaseDoc>[]) =>
diff --git a/src/app/services/statistics.service.ts b/src/app/services/statistics.service.ts
index 033c228..88355c1 100644
--- a/src/app/services/statistics.service.ts
+++ b/src/app/services/statistics.service.ts
@@ -1,38 +1,26 @@
 import { Injectable } from '@angular/core';
-import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
-import { VineyardDoc } from '../models/vineyarddoc.model';
+import { AngularFirestore } from '@angular/fire/firestore';
 import { BehaviorSubject } from 'rxjs';
 import { Action } from '../models/action.model';
-import { AuthService } from './auth.service';
-import { User } from 'firebase';
 import { MeteoStatEntry, MeteoStats, Vineyard } from '../models/vineyard.model';
 import { map } from 'rxjs/operators';
 import * as moment from 'moment/moment';
 import { SeasonsService } from './seasons.service';
 
-export const STATS_COLLECTION = 'stats';
-
 @Injectable({
   providedIn: 'root',
 })
 export class StatisticsService {
-  private _vineyardCollection: AngularFirestoreCollection<VineyardDoc>;
-
   private _meteoStats: BehaviorSubject<MeteoStatEntry[]>;
 
   private BASE_TEMP = 10.0;
 
-  constructor(
-    private fireStore: AngularFirestore,
-    private authService: AuthService,
-    private seasonService: SeasonsService
-  ) {
+  constructor(private fireStore: AngularFirestore, private seasonService: SeasonsService) {
     this._meteoStats = new BehaviorSubject<MeteoStatEntry[]>([]);
-    this.authService.getUser().subscribe((user: User) => {
-      if (user) {
-        this._vineyardCollection = fireStore.collection<VineyardDoc>(`users/${user.uid}/vineyards`);
-      }
-    });
+  }
+
+  private getVineyardMeteoCollectionPath(vineyard: Vineyard): string {
+    return `users/${vineyard.owner}/vineyards/${vineyard.id}/stats`;
   }
 
   public getMeteoListener(): BehaviorSubject<MeteoStatEntry[]> {
@@ -40,9 +28,8 @@ export class StatisticsService {
   }
 
   public getMeteoStats(vineyard: Vineyard): void {
-    this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<any>(STATS_COLLECTION)
+    this.fireStore
+      .collection(this.getVineyardMeteoCollectionPath(vineyard))
       .doc('meteo')
       .snapshotChanges()
       .pipe(
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
new file mode 100644
index 0000000..e445b12
--- /dev/null
+++ b/src/app/services/user.service.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+import { AngularFirestore } from '@angular/fire/firestore';
+import { UserData } from '../../../functions/src/models/userdata.model';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class UserService {
+  constructor(private fireStore: AngularFirestore) {}
+
+  public getUserInfo(userId: string) {
+    return this.fireStore
+      .collection<UserData>(`/users`)
+      .doc(userId)
+      .get()
+      .pipe(map((doc) => doc.data()));
+  }
+}
diff --git a/src/app/services/variety.service.ts b/src/app/services/variety.service.ts
index ccdb2f2..c63dcf5 100644
--- a/src/app/services/variety.service.ts
+++ b/src/app/services/variety.service.ts
@@ -1,64 +1,38 @@
 import { Injectable } from '@angular/core';
-import {
-  AngularFirestore,
-  AngularFirestoreCollection,
-  DocumentChangeAction,
-  DocumentReference,
-} from '@angular/fire/firestore';
+import { AngularFirestore, DocumentChangeAction, DocumentReference } from '@angular/fire/firestore';
 import { Vineyard } from '../models/vineyard.model';
-import { VineyardDoc } from '../models/vineyarddoc.model';
 import { map } from 'rxjs/operators';
 import { BehaviorSubject } from 'rxjs';
 import { Action, ActionType, PlantingAction } from '../models/action.model';
 import { Variety } from '../models/variety.model';
-import { User } from 'firebase';
-import { AuthService } from './auth.service';
 import { Vintage } from '../models/vintage.model';
 import { ActionService } from './action.service';
 
-export const VARIETY_COLLECTION = 'varieties';
-
 @Injectable({
   providedIn: 'root',
 })
 export class VarietyService {
-  private _vineyardCollection: AngularFirestoreCollection<VineyardDoc>;
-
   private _varieties: BehaviorSubject<Variety[]>;
 
-  constructor(
-    private fireStore: AngularFirestore,
-    private actionService: ActionService,
-    private authService: AuthService
-  ) {
+  constructor(private fireStore: AngularFirestore, private actionService: ActionService) {
     this._varieties = new BehaviorSubject<Variety[]>([]);
-    this.authService.getUser().subscribe((user: User) => {
-      if (user) {
-        this._vineyardCollection = fireStore.collection<VineyardDoc>(`users/${user.uid}/vineyards`);
-      }
-    });
   }
 
   public getVarietyListener(): BehaviorSubject<Variety[]> {
     return this._varieties;
   }
 
+  private getVineyardVarietiesCollectionPath(vineyard: Vineyard): string {
+    return `users/${vineyard.owner}/vineyards/${vineyard.id}/varieties`;
+  }
+
   public addVariety(vineyard: Vineyard, variety: Variety): Promise<string> {
-    return this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<Variety>(VARIETY_COLLECTION)
+    return this.fireStore
+      .collection<Variety>(this.getVineyardVarietiesCollectionPath(vineyard))
       .add(variety)
       .then((doc: DocumentReference) => doc.id);
   }
 
-  public updateVariety(vineyard: Vineyard, variety: Variety): void {
-    this._vineyardCollection.doc(vineyard.id).collection<Variety>(VARIETY_COLLECTION).doc(variety.id).set(variety);
-  }
-
-  public removeVaerity(vineyard: Vineyard, variety: Variety): void {
-    this._vineyardCollection.doc(vineyard.id).collection<Variety>(VARIETY_COLLECTION).doc(variety.id).delete();
-  }
-
   public getVarietyByName(name: string): Variety {
     return this._varieties.getValue().find((v: Variety) => v.name === name);
   }
@@ -68,9 +42,8 @@ export class VarietyService {
   }
 
   public getVarieties(vineyard: Vineyard): void {
-    this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<Variety>(VARIETY_COLLECTION)
+    this.fireStore
+      .collection<Variety>(this.getVineyardVarietiesCollectionPath(vineyard))
       .snapshotChanges()
       .pipe(
         map((data: DocumentChangeAction<Variety>[]) =>
@@ -113,6 +86,6 @@ export class VarietyService {
   }
 
   getVintageVarietiesLabel(vintage: Vintage): string {
-    return vintage.varieties.map((v: string) => this.getVarietyByID(v).name).join(', ');
+    return vintage.varieties.map((v: string) => this.getVarietyByID(v)?.name || '').join(', ');
   }
 }
diff --git a/src/app/services/vineyard.service.ts b/src/app/services/vineyard.service.ts
index 01f7182..1623822 100644
--- a/src/app/services/vineyard.service.ts
+++ b/src/app/services/vineyard.service.ts
@@ -1,13 +1,9 @@
 import { Polygon } from 'ol/geom';
-import { VineyardDoc } from '../models/vineyarddoc.model';
-import { MeteoStatEntry, Vineyard } from '../models/vineyard.model';
-import { Variety } from '../models/variety.model';
-import { UtilService } from './util.service';
+import { SharedVineyardDoc, VineyardDoc, VineyardPermissionsDoc } from '../models/vineyarddoc.model';
+import { Vineyard, VineyardPermissions } from '../models/vineyard.model';
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { BehaviorSubject, Observable, of } from 'rxjs';
+import { BehaviorSubject, combineLatest, forkJoin, Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
-import { Action, ActionType } from '../models/action.model';
 import {
   AngularFirestore,
   AngularFirestoreCollection,
@@ -15,11 +11,11 @@ import {
   DocumentReference,
 } from '@angular/fire/firestore';
 import { GeoJSON } from 'ol/format';
-import * as moment from 'moment';
 import { AuthService } from './auth.service';
 import { User } from 'firebase';
 import { getCenter } from 'ol/extent';
 import { transformExtent } from 'ol/proj';
+import { UserService } from './user.service';
 
 @Injectable({
   providedIn: 'root',
@@ -33,23 +29,25 @@ export class VineyardService {
 
   private _vineyardCollection: AngularFirestoreCollection<VineyardDoc>;
 
-  private _API: string = 'https://us-central1-winery-f4d20.cloudfunctions.net';
+  private _sharedVineyardCollection: AngularFirestoreCollection<SharedVineyardDoc>;
 
-  constructor(
-    private http: HttpClient,
-    private utilService: UtilService,
-    private fireStore: AngularFirestore,
-    private authService: AuthService
-  ) {
+  private _userId: string;
+
+  constructor(private fireStore: AngularFirestore, private authService: AuthService, private userService: UserService) {
     this._vineyards$ = new BehaviorSubject<Vineyard[]>([]);
     this._activeVineyard$ = new BehaviorSubject<Vineyard>(null);
     this._activeSeasons$ = new BehaviorSubject<number[]>([new Date().getFullYear()]);
 
     this.authService.getUser().subscribe((user: User) => {
       if (user) {
-        this._vineyardCollection = fireStore.collection<VineyardDoc>(`users/${user.uid}/vineyards`);
+        this._userId = user.uid;
+        this._vineyardCollection = fireStore.collection<VineyardDoc>(`users/${this._userId}/vineyards`);
+        this._sharedVineyardCollection = fireStore.collection<SharedVineyardDoc>(
+          `users/${this._userId}/sharedVineyards`
+        );
         this.getVineyards();
       } else {
+        this._userId = undefined;
         this._vineyards$.next([]);
       }
     });
@@ -59,10 +57,6 @@ export class VineyardService {
     return this._vineyards$;
   }
 
-  setActiveVineyard(id: string): void {
-    this._activeVineyard$.next(id ? this._vineyards$.getValue().find((v: Vineyard) => v.id === id) : null);
-  }
-
   getActiveVineyard(): Observable<Vineyard> {
     return this._activeVineyard$;
   }
@@ -76,15 +70,9 @@ export class VineyardService {
   }
 
   getVineyards(): void {
-    this._vineyardCollection
-      .snapshotChanges()
+    combineLatest(this.getUserVineyards(), this.getSharedVineyards())
       .pipe(
-        map((data: DocumentChangeAction<VineyardDoc>[]) =>
-          data.map((d: DocumentChangeAction<VineyardDoc>) => ({
-            ...d.payload.doc.data(),
-            id: (d.payload.doc as any).id,
-          }))
-        ),
+        map(([owned, shared]) => [...owned, ...shared]),
         map((docs: VineyardDoc[]) =>
           docs.map((d: VineyardDoc) => ({
             ...d,
@@ -98,47 +86,95 @@ export class VineyardService {
           }))
         )
       )
-      .subscribe((vineyards: Vineyard[]) => {
-        this._vineyards$.next(vineyards);
+      .subscribe({
+        next: (vineyards: Vineyard[]) => {
+          this._vineyards$.next(vineyards);
+        },
+        error: (error: any) => {
+          console.error(`Something went wrong while fetching vineyards for user ${this._userId}`, error);
+        },
       });
   }
 
-  getInfo(id: string): Vineyard {
-    return this._vineyards$.getValue().find((v: Vineyard) => v.id === id);
-  }
-
-  updateTempStats(v: Vineyard): Observable<boolean> {
-    return this.http.get(`${this._API}/updateTemp?vineyardId=${v.id}`).pipe(
-      switchMap(() => of(true)),
-      catchError(() => of(false))
-    );
-  }
-
-  getVarieties(info: Vineyard, year: number = new Date().getFullYear()): Variety[] {
-    const plantingActions = this.getActions(info, [ActionType.Planting], year);
-    return plantingActions.length > 0
-      ? []
-          .concat(...plantingActions.map((a: Action) => a.variety))
-          .map((id: string) => info.varieties.find((v: Variety) => v.id === id))
-      : [];
-  }
-
-  getFirstPlanting(info: Vineyard): Action {
-    const plantingActions = this.getActions(info, [ActionType.Planting]);
-    return plantingActions.length > 0 ? plantingActions[0] : undefined;
-  }
-
-  getLastPlanting(info: Vineyard): Action {
-    const plantingActions = this.getActions(info, [ActionType.Planting]);
-    return plantingActions.length > 0 ? plantingActions[plantingActions.length - 1] : undefined;
+  private getUserVineyards(): Observable<Vineyard[]> {
+    return this._userId
+      ? this._vineyardCollection.snapshotChanges().pipe(
+          map((data: DocumentChangeAction<VineyardDoc>[]) =>
+            data.map((d: DocumentChangeAction<VineyardDoc>) => ({
+              ...d.payload.doc.data(),
+              id: (d.payload.doc as any).id,
+              shared: false,
+              permissions: VineyardPermissions.OWNER,
+              owner: this._userId,
+            }))
+          ),
+          catchError((error) => {
+            console.error(`Error while retrieving vineyards of user ${this._userId}`, error);
+            return of([]);
+          })
+        )
+      : of([]);
+  }
+
+  private getSharedVineyards(): Observable<Vineyard[]> {
+    return this._userId
+      ? this._sharedVineyardCollection.snapshotChanges().pipe(
+          map((data: DocumentChangeAction<SharedVineyardDoc>[]) =>
+            data.map((d: DocumentChangeAction<SharedVineyardDoc>) => d.payload.doc.data())
+          ),
+          switchMap((shared: SharedVineyardDoc[]) =>
+            (shared.length > 0
+              ? forkJoin(
+                  shared.map((s: SharedVineyardDoc) =>
+                    forkJoin(
+                      // Fetch the shared vineyard
+                      this.fireStore.collection<VineyardDoc>(`users/${s.user}/vineyards`).doc(s.vineyard).get(),
+                      // Fetch the permissions on the shared vineyard
+                      this.fireStore
+                        .collection<VineyardDoc>(`users/${s.user}/vineyards/${s.vineyard}/permissions/`)
+                        .doc(this._userId)
+                        .get()
+                        .pipe(
+                          map((doc) => (doc.data() as VineyardPermissionsDoc).permissions),
+                          catchError((error) => {
+                            console.error(
+                              `Could not fetch permissions for user ${this._userId} on vineyard ${s.vineyard} of user ${s.user}`,
+                              error
+                            );
+                            return of(VineyardPermissions.NONE);
+                          })
+                        ),
+                      // Get the user data of the vineyard owner
+                      this.userService.getUserInfo(s.user)
+                    ).pipe(
+                      map(([doc, permissions, user]) => ({
+                        ...doc.data(),
+                        id: doc.id,
+                        shared: true,
+                        permissions: permissions,
+                        owner: s.user,
+                        ownerName: user.name,
+                      })),
+                      catchError((error: any) => {
+                        console.error(`Cannot open vineyard ${s.vineyard}`, error);
+                        return of(undefined);
+                      })
+                    )
+                  )
+                )
+              : of([])
+            ).pipe(map((docs) => docs.filter((d) => !!d && d.permissions !== VineyardPermissions.NONE)))
+          ),
+          catchError((error) => {
+            console.error(`Failed to retrieved shared vineyards for user ${this._userId}`, error);
+            return of([]);
+          })
+        )
+      : of([]);
   }
 
-  getActions(info: Vineyard, types: ActionType[] = [], maxYear: number = new Date().getFullYear()): Action[] {
-    let actions = info ? info.actions : [];
-    if (types.length > 0) {
-      actions = actions.filter((a: Action) => types.indexOf(a.type) >= 0);
-    }
-    return actions.length > 0 ? actions.filter((a: Action) => a.date.year() <= maxYear) : actions;
+  getInfo(id: string): Vineyard {
+    return this._vineyards$.getValue().find((v: Vineyard) => v.id === id);
   }
 
   updateLocation(id: string, geometry: Polygon): void {
@@ -169,14 +205,6 @@ export class VineyardService {
       .forEach((d: VineyardDoc) => this._vineyardCollection.doc(d.id).set(d));
   }
 
-  updateVineyard(vineyard: Vineyard): void {
-    const vineyards: Vineyard[] = this._vineyards$
-      .getValue()
-      .map((v: Vineyard) => (v.id === vineyard.id ? vineyard : v));
-    this._vineyards$.next(vineyards);
-    this.saveVineyards([vineyard.id]);
-  }
-
   async addVineyard(name: string, address: string, location: Polygon): Promise<DocumentReference> {
     const geoJSON = new GeoJSON({
       dataProjection: 'EPSG:4326',
@@ -200,18 +228,6 @@ export class VineyardService {
     this._vineyards$.next(vineyards);
   }
 
-  getMeteoYears(info: Vineyard): number[] {
-    return info && info.meteo && info.meteo.data
-      ? [...new Set(info.meteo.data.map((e: MeteoStatEntry) => moment(e.date).year()))]
-      : [];
-  }
-
-  getMeteoByYears(info: Vineyard, years: number[]): MeteoStatEntry[] {
-    return info && info.meteo && info.meteo.data
-      ? info.meteo.data.filter((e: MeteoStatEntry) => years.indexOf(moment(e.date).year()) >= 0)
-      : [];
-  }
-
   getLocation(vineyard: Vineyard): [number, number] {
     return getCenter(transformExtent(vineyard.location.getExtent(), 'EPSG:3857', 'EPSG:4326'));
   }
diff --git a/src/app/services/vintage.service.ts b/src/app/services/vintage.service.ts
index e770281..a42e96a 100644
--- a/src/app/services/vintage.service.ts
+++ b/src/app/services/vintage.service.ts
@@ -1,52 +1,46 @@
 import { Injectable } from '@angular/core';
-import { AngularFirestore, AngularFirestoreCollection, DocumentChangeAction } from '@angular/fire/firestore';
+import { AngularFirestore, DocumentChangeAction } from '@angular/fire/firestore';
 import { Vineyard } from '../models/vineyard.model';
 import { Vintage } from '../models/vintage.model';
-import { VineyardDoc } from '../models/vineyarddoc.model';
 import { map } from 'rxjs/operators';
 import { BehaviorSubject } from 'rxjs';
-import { User } from 'firebase';
-import { AuthService } from './auth.service';
-
-export const VINTAGE_COLLECTION = 'vintages';
 
 @Injectable({
   providedIn: 'root',
 })
 export class VintageService {
-  private _vineyardCollection: AngularFirestoreCollection<VineyardDoc>;
-
   private _vintages: BehaviorSubject<Vintage[]>;
 
-  constructor(private fireStore: AngularFirestore, private authService: AuthService) {
+  constructor(private fireStore: AngularFirestore) {
     this._vintages = new BehaviorSubject<Vintage[]>([]);
-    this.authService.getUser().subscribe((user: User) => {
-      if (user) {
-        this._vineyardCollection = fireStore.collection<VineyardDoc>(`users/${user.uid}/vineyards`);
-      }
-    });
+  }
+
+  private getVineyardVintagesCollectionPath(vineyard: Vineyard): string {
+    return `users/${vineyard.owner}/vineyards/${vineyard.id}/vintages`;
   }
 
   public getVintageListener(): BehaviorSubject<Vintage[]> {
     return this._vintages;
   }
 
-  public addVintage(vineyard: Vineyard, vintage: Vintage): void {
-    this._vineyardCollection.doc(vineyard.id).collection<Vintage>(VINTAGE_COLLECTION).add(vintage);
+  public async addVintage(vineyard: Vineyard, vintage: Vintage): Promise<void> {
+    await this.fireStore.collection<Vintage>(this.getVineyardVintagesCollectionPath(vineyard)).add(vintage);
   }
 
-  public updateVintage(vineyard: Vineyard, vintage: Vintage): void {
-    this._vineyardCollection.doc(vineyard.id).collection<Vintage>(VINTAGE_COLLECTION).doc(vintage.id).set(vintage);
+  public async updateVintage(vineyard: Vineyard, vintage: Vintage): Promise<void> {
+    await this.fireStore
+      .collection<Vintage>(this.getVineyardVintagesCollectionPath(vineyard))
+      .doc(vintage.id)
+      .set(vintage);
   }
 
-  public removeVintage(vineyard: Vineyard, vintage: Vintage): void {
-    this._vineyardCollection.doc(vineyard.id).collection<Vintage>(VINTAGE_COLLECTION).doc(vintage.id).delete();
+  public async removeVintage(vineyard: Vineyard, vintage: Vintage): Promise<void> {
+    await this.fireStore.collection<Vintage>(this.getVineyardVintagesCollectionPath(vineyard)).doc(vintage.id).delete();
   }
 
   public getVintages(vineyard: Vineyard): void {
-    this._vineyardCollection
-      .doc(vineyard.id)
-      .collection<Vintage>(VINTAGE_COLLECTION)
+    this.fireStore
+      .collection<Vintage>(this.getVineyardVintagesCollectionPath(vineyard))
       .snapshotChanges()
       .pipe(
         map((data: DocumentChangeAction<Vintage>[]) =>
diff --git a/src/app/shared/directives/has-permissions.directive.ts b/src/app/shared/directives/has-permissions.directive.ts
new file mode 100644
index 0000000..b913f13
--- /dev/null
+++ b/src/app/shared/directives/has-permissions.directive.ts
@@ -0,0 +1,17 @@
+import { Directive, Input, TemplateRef, ViewContainerRef } from '@angular/core';
+import { VineyardPermissions } from '../../models/vineyard.model';
+
+@Directive({
+  selector: '[appHasPermissions]',
+})
+export class HasPermissionsDirective {
+  constructor(private vcr: ViewContainerRef, private tpl: TemplateRef<any>) {}
+
+  @Input() set appHasPermissions({ vineyard, permissions }) {
+    if ((vineyard?.permissions || VineyardPermissions.NONE) >= permissions) {
+      this.vcr.createEmbeddedView(this.tpl);
+    } else {
+      this.vcr.clear();
+    }
+  }
+}
diff --git a/src/app/shared/directives/premium-feature.directive.ts b/src/app/shared/directives/premium-feature.directive.ts
deleted file mode 100644
index ca6b019..0000000
--- a/src/app/shared/directives/premium-feature.directive.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Directive, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
-import { FeaturesService } from '../../services/features.service';
-
-@Directive({
-  selector: '[appPremiumFeature]',
-})
-export class PremiumFeatureDirective implements OnInit {
-  constructor(private featureService: FeaturesService, private vcr: ViewContainerRef, private tpl: TemplateRef<any>) {}
-
-  ngOnInit() {
-    this.featureService.isUserPremium().subscribe({
-      next: (premium: boolean) => {
-        if (premium) {
-          this.vcr.createEmbeddedView(this.tpl);
-        } else {
-          this.vcr.clear();
-        }
-      },
-      error: (error: any) => {
-        console.error('Could not check premium feature', error);
-        this.vcr.clear();
-      },
-    });
-  }
-}
diff --git a/src/app/shared/guards/has-permissions.guard.ts b/src/app/shared/guards/has-permissions.guard.ts
new file mode 100644
index 0000000..76df82e
--- /dev/null
+++ b/src/app/shared/guards/has-permissions.guard.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate } from '@angular/router';
+import { Observable } from 'rxjs';
+import { Vineyard, VineyardPermissions } from '../../models/vineyard.model';
+import { VineyardService } from '../../services/vineyard.service';
+import { map, skipWhile } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class HasPermissionsGuard implements CanActivate {
+  private routes = [
+    {
+      tab: 'notes',
+      permissions: VineyardPermissions.OWNER,
+    },
+  ];
+
+  constructor(private vineyardService: VineyardService) {}
+
+  canActivate(route: ActivatedRouteSnapshot): Observable<boolean> {
+    return this.vineyardService.getVineyardsListener().pipe(
+      skipWhile((vineyards: Vineyard[]) => vineyards?.length == 0),
+      map((vineyards: Vineyard[]) => {
+        const activeVineyard = vineyards.find((v: Vineyard) => v.id === route.params.id);
+        return activeVineyard.permissions >= this.getRoutePermissions(route);
+      })
+    );
+  }
+
+  private getRoutePermissions(route: ActivatedRouteSnapshot): VineyardPermissions {
+    return this.routes.find((r) => r.tab === route.params.tab)?.permissions || VineyardPermissions.NONE;
+  }
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 29cdf5a..f3217b6 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -13,9 +13,9 @@ import { UsermenuComponent } from './components/usermenu/usermenu.component';
 import { LayersComponent } from './components/toolbar/layers/layers.component';
 import { ConfirmComponent } from './components/confirm/confirm.component';
 import { UserbuttonComponent } from './components/userbutton/userbutton.component';
-import { PremiumFeatureDirective } from './directives/premium-feature.directive';
 import { MomentPipe } from '../pipes/moment.pipe';
 import { HasRoleDirective } from './directives/has-role.directive';
+import { HasPermissionsDirective } from './directives/has-permissions.directive';
 
 @NgModule({
   declarations: [
@@ -29,9 +29,9 @@ import { HasRoleDirective } from './directives/has-role.directive';
     LayersComponent,
     ConfirmComponent,
     UserbuttonComponent,
-    PremiumFeatureDirective,
     MomentPipe,
     HasRoleDirective,
+    HasPermissionsDirective,
   ],
   imports: [CommonModule, FormsModule, IonicModule, HttpClientModule],
   exports: [
@@ -45,9 +45,9 @@ import { HasRoleDirective } from './directives/has-role.directive';
     LayersComponent,
     ConfirmComponent,
     UserbuttonComponent,
-    PremiumFeatureDirective,
     MomentPipe,
     HasRoleDirective,
+    HasPermissionsDirective,
   ],
 })
 export class SharedModule {}
diff --git a/src/app/vineyeard-view/actions/actions.component.html b/src/app/vineyeard-view/actions/actions.component.html
index 8a4e510..96f3628 100644
--- a/src/app/vineyeard-view/actions/actions.component.html
+++ b/src/app/vineyeard-view/actions/actions.component.html
@@ -13,7 +13,7 @@
       <div class="text">
         <ion-card-title [class.mobile]="utilService.isMobile()">
           <span>{{activity.date | date:'dd MMMM yyyy'}}<ion-badge [style.backgroundColor]="getActionTypeColor(actionService.findActionType(activity.type))">{{actionService.findActionType(activity.type)}}</ion-badge></span>
-          <span><ion-icon name="create-outline" (click)="openAddActionModal(activity)"></ion-icon><ion-icon name="trash-outline" (click)="removeAction(activity)"></ion-icon></span>
+          <span  *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.EDIT}"><ion-icon name="create-outline" (click)="openAddActionModal(activity)"></ion-icon><ion-icon name="trash-outline" (click)="removeAction(activity)"></ion-icon></span>
         </ion-card-title>
         <ion-card-subtitle>
           <div class="subtitle">
@@ -39,7 +39,7 @@
     </ion-card-content>
   </ion-card>
 </div>
-<ion-fab vertical="bottom" horizontal="end" slot="fixed">
+<ion-fab vertical="bottom" horizontal="end" slot="fixed" *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.EDIT}">
   <ion-fab-button (click)="openAddActionModal()">
     <ion-icon name="add-outline"></ion-icon>
   </ion-fab-button>
diff --git a/src/app/vineyeard-view/actions/actions.component.ts b/src/app/vineyeard-view/actions/actions.component.ts
index 003b771..1603f31 100644
--- a/src/app/vineyeard-view/actions/actions.component.ts
+++ b/src/app/vineyeard-view/actions/actions.component.ts
@@ -3,7 +3,7 @@ import { Action, ActionType, BaseAction, BBCHAction, BrixAction, PlantingAction
 import { ModalController, Platform } from '@ionic/angular';
 import { VineyardService } from './../../services/vineyard.service';
 import { Component, Input, OnChanges } from '@angular/core';
-import { Vineyard } from 'src/app/models/vineyard.model';
+import { Vineyard, VineyardPermissions } from 'src/app/models/vineyard.model';
 import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
 import { Router } from '@angular/router';
 import { AddActionComponent } from '../add-action/add-action.component';
@@ -158,4 +158,6 @@ export class ActionsComponent implements OnChanges {
       ? varieties.map((v: string) => this.varietyService.getVarietyByID(v)).filter((v: Variety) => !!v)
       : [];
   }
+
+  public readonly VineyardPermissions = VineyardPermissions;
 }
diff --git a/src/app/vineyeard-view/bbch/bbch.component.html b/src/app/vineyeard-view/bbch/bbch.component.html
index a12e24f..9e81040 100644
--- a/src/app/vineyeard-view/bbch/bbch.component.html
+++ b/src/app/vineyeard-view/bbch/bbch.component.html
@@ -1,5 +1,5 @@
-<link rel="stylesheet" href="bbch.component.scss">
 <div class="bbch-container">
+  <span *ngIf="summary?.length === 0">No BBCH stages available</span>
   <div class="row" *ngFor="let variety of summary">
     <h2>{{variety.label}}
       <div class="status">
diff --git a/src/app/vineyeard-view/bbch/bbch.component.ts b/src/app/vineyeard-view/bbch/bbch.component.ts
index 7d9d31f..9ebbefd 100644
--- a/src/app/vineyeard-view/bbch/bbch.component.ts
+++ b/src/app/vineyeard-view/bbch/bbch.component.ts
@@ -61,7 +61,6 @@ export class BbchComponent implements OnChanges {
         }
       }
     }
-    console.log(summary);
     return summary.map((v) => {
       const codes: number[] = this.years.map((y) => (v[y] ? v[y].value : undefined)).filter((d) => !!d);
       const diff = codes.length > 1 ? codes[1].toString().localeCompare(codes[0].toString()) : 0;
diff --git a/src/app/vineyeard-view/info/info.component.html b/src/app/vineyeard-view/info/info.component.html
index 14eaeca..b5973d2 100644
--- a/src/app/vineyeard-view/info/info.component.html
+++ b/src/app/vineyeard-view/info/info.component.html
@@ -36,19 +36,23 @@
                 </ion-card-content>
             </ion-card>
         </ion-col>
-        <ion-col class="ion-align-self-stretch" size="12" size-sm="6" *appPremiumFeature>
-            <ion-card>
-                <ion-card-header>
-                    <ion-card-title>Seasons</ion-card-title>
-                </ion-card-header>
-                <ion-card-content>
-                    <app-seasons [vineyard]="vineyard" [seasons]="activeSeasons" [actions]="actions"></app-seasons>
-                </ion-card-content>
-            </ion-card>
-        </ion-col>
+        <ng-container *appUserHasRole="PREMIUM_ROLES">
+            <ng-container *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.OWNER}">
+                <ion-col class="ion-align-self-stretch" size="12" size-sm="6"  >
+                    <ion-card>
+                        <ion-card-header>
+                            <ion-card-title>Seasons</ion-card-title>
+                        </ion-card-header>
+                        <ion-card-content>
+                            <app-seasons [vineyard]="vineyard" [seasons]="activeSeasons" [actions]="actions"></app-seasons>
+                        </ion-card-content>
+                    </ion-card>
+            </ion-col>
+            </ng-container>
+        </ng-container>
     </ion-row>
     <ion-row class="ion-align-items-stretch">
-        <ion-col class="ion-align-self-stretch" *appPremiumFeature>
+        <ion-col class="ion-align-self-stretch" *appUserHasRole="PREMIUM_ROLES">
             <ion-card>
                 <ion-card-header>
                     <ion-card-title>Weather</ion-card-title>
@@ -58,28 +62,36 @@
                 </ion-card-content>
             </ion-card>
         </ion-col>
-        <ion-col class="ion-align-self-stretch" size="12" size-sm="3" *appPremiumFeature>
-            <ion-card>
-                <ion-card-header>
-                    <ion-card-title>Warnings</ion-card-title>
-                </ion-card-header>
-                <ion-card-content>
-                    <app-warnings [vineyard]="vineyard"></app-warnings>
-                </ion-card-content>
-            </ion-card>
-        </ion-col>
+        <ng-container *appUserHasRole="PREMIUM_ROLES">
+            <ng-container *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.OWNER}">
+                <ion-col class="ion-align-self-stretch" size="12" size-sm="3">
+                    <ion-card>
+                        <ion-card-header>
+                            <ion-card-title>Warnings</ion-card-title>
+                        </ion-card-header>
+                        <ion-card-content>
+                            <app-warnings [vineyard]="vineyard"></app-warnings>
+                        </ion-card-content>
+                    </ion-card>
+                </ion-col>
+            </ng-container>
+        </ng-container>
     </ion-row>
     <ion-row class="ion-align-items-stretch">
-        <ion-col class="ion-align-self-stretch" size="12" size-sm="3" *appPremiumFeature>
-            <ion-card>
-                <ion-card-header>
-                    <ion-card-title>BBCH</ion-card-title>
-                </ion-card-header>
-                <ion-card-content>
-                    <app-bbch [actions]="actions"></app-bbch>
-                </ion-card-content>
-            </ion-card>
-        </ion-col>
+        <ng-container *appUserHasRole="PREMIUM_ROLES">
+            <ng-container *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.OWNER}">
+                <ion-col class="ion-align-self-stretch" size="12" size-sm="3" *appUserHasRole="PREMIUM_ROLES">
+                    <ion-card>
+                        <ion-card-header>
+                            <ion-card-title>BBCH</ion-card-title>
+                        </ion-card-header>
+                        <ion-card-content>
+                            <app-bbch [actions]="actions"></app-bbch>
+                        </ion-card-content>
+                    </ion-card>
+                </ion-col>
+            </ng-container>
+        </ng-container>
         <ion-col class="ion-align-self-stretch">
             <ion-card>
                 <ion-card-header>
diff --git a/src/app/vineyeard-view/info/info.component.ts b/src/app/vineyeard-view/info/info.component.ts
index 2084c8e..5268af9 100644
--- a/src/app/vineyeard-view/info/info.component.ts
+++ b/src/app/vineyeard-view/info/info.component.ts
@@ -1,7 +1,7 @@
 import { UtilService } from './../../services/util.service';
 import { Variety } from './../../models/variety.model';
 import { Platform } from '@ionic/angular';
-import { Vineyard } from './../../models/vineyard.model';
+import { Vineyard, VineyardPermissions } from './../../models/vineyard.model';
 import { VineyardService } from './../../services/vineyard.service';
 import { AfterViewInit, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import View from 'ol/View';
@@ -16,6 +16,7 @@ import { VarietyService } from '../../services/variety.service';
 import { ActionService } from '../../services/action.service';
 import * as moment from 'moment';
 import { FeaturesService } from '../../services/features.service';
+import { PREMIUM_ROLES } from '../../models/userdata.model';
 
 @Component({
   selector: 'app-info',
@@ -114,4 +115,8 @@ export class InfoComponent implements OnChanges, AfterViewInit {
   getTotalCount(): number {
     return this.varietyService.getPlantCount(this.varieties);
   }
+
+  public readonly PREMIUM_ROLES = PREMIUM_ROLES;
+
+  public readonly VineyardPermissions = VineyardPermissions;
 }
diff --git a/src/app/vineyeard-view/menu/menu.component.html b/src/app/vineyeard-view/menu/menu.component.html
index df1f059..8d3021f 100644
--- a/src/app/vineyeard-view/menu/menu.component.html
+++ b/src/app/vineyeard-view/menu/menu.component.html
@@ -27,7 +27,7 @@
       <ion-icon name="information-circle" slot="start"></ion-icon>
       <ion-label>Info</ion-label>
     </div>
-    <div class="item" (click)="openTab(MenuTab.NOTES)"   [class.selected]="activePage === 'notes'">
+    <div class="item" (click)="openTab(MenuTab.NOTES)" *appHasPermissions="{vineyard: activeVineyard , permissions: VineyardPermissions.OWNER}"  [class.selected]="activePage === 'notes'">
       <ion-icon name="create" slot="start"></ion-icon>
       <ion-label>Notes</ion-label>
     </div>
@@ -42,7 +42,7 @@
   </div>
 </div>
 
-<div class="section" *appPremiumFeature>
+<div class="section" *appUserHasRole="PREMIUM_ROLES">
   <div class="header">
     <ion-label>Vintages</ion-label>
   </div>
@@ -55,7 +55,7 @@
       </ion-label>
     </div>
     <div class="item action">
-      <ion-button (click)="openAddVintageModal()" fill="clear"><ion-icon name="add-outline"></ion-icon>Add vintage</ion-button>
+      <ion-button *appHasPermissions="{vineyard: activeVineyard, permissions: VineyardPermissions.EDIT}" (click)="openAddVintageModal()" fill="clear"><ion-icon name="add-outline"></ion-icon>Add vintage</ion-button>
     </div>
   </div>
 </div>
diff --git a/src/app/vineyeard-view/menu/menu.component.ts b/src/app/vineyeard-view/menu/menu.component.ts
index c6c9c47..585d50d 100644
--- a/src/app/vineyeard-view/menu/menu.component.ts
+++ b/src/app/vineyeard-view/menu/menu.component.ts
@@ -1,13 +1,13 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { SeasonsService } from '../../services/seasons.service';
 import { ModalController, NavController } from '@ionic/angular';
-import { Vineyard } from '../../models/vineyard.model';
+import { Vineyard, VineyardPermissions } from '../../models/vineyard.model';
 import { Location } from '@angular/common';
 import { Vintage } from '../../models/vintage.model';
 import { AddVintageComponent } from '../add-vintage/add-vintage.component';
 import { VintageService } from '../../services/vintage.service';
 import { VarietyService } from '../../services/variety.service';
-import { NON_PREMIUM_ROLES } from '../../models/userdata.model';
+import { NON_PREMIUM_ROLES, PREMIUM_ROLES } from '../../models/userdata.model';
 
 export enum MenuTab {
   INFO = 'info',
@@ -105,12 +105,12 @@ export class MenuComponent implements OnInit {
 
     const data = await modal.onWillDismiss();
     if (data.data.vintage) {
-      this.parseVintage(data.data.vintage);
+      await this.parseVintage(data.data.vintage);
     }
   }
 
-  private parseVintage(vintage: Vintage) {
-    this.vintageService.addVintage(this.activeVineyard, vintage);
+  private async parseVintage(vintage: Vintage) {
+    await this.vintageService.addVintage(this.activeVineyard, vintage);
   }
 
   viewVintage(vintage: Vintage) {
@@ -120,4 +120,8 @@ export class MenuComponent implements OnInit {
   }
 
   public readonly NON_PREMIUM_ROLES = NON_PREMIUM_ROLES;
+
+  public readonly PREMIUM_ROLES = PREMIUM_ROLES;
+
+  public readonly VineyardPermissions = VineyardPermissions;
 }
diff --git a/src/app/vineyeard-view/notes/notes.component.html b/src/app/vineyeard-view/notes/notes.component.html
index a4615ee..304ae65 100644
--- a/src/app/vineyeard-view/notes/notes.component.html
+++ b/src/app/vineyeard-view/notes/notes.component.html
@@ -8,7 +8,7 @@
       <ion-card-title>
         <div class="subtitle">
           <span>{{note.date | date:'dd MMMM yyyy'}}</span>
-          <span><ion-icon name="create-outline" (click)="editNote(note)"></ion-icon><ion-icon name="trash-outline" (click)="deleteNote(note)"></ion-icon></span>
+          <span *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.EDIT}"><ion-icon name="create-outline" (click)="editNote(note)"></ion-icon><ion-icon name="trash-outline" (click)="deleteNote(note)"></ion-icon></span>
         </div>
       </ion-card-title>
     </ion-card-header>
@@ -22,7 +22,7 @@
     </ion-card-content>
   </ion-card>
 </div>
-<ion-fab vertical="bottom" horizontal="end" slot="fixed">
+<ion-fab *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.EDIT}" vertical="bottom" horizontal="end" slot="fixed">
   <ion-fab-button (click)="openAddNoteModal()">
     <ion-icon name="add-outline"></ion-icon>
   </ion-fab-button>
diff --git a/src/app/vineyeard-view/notes/notes.component.ts b/src/app/vineyeard-view/notes/notes.component.ts
index a2e369d..b163348 100644
--- a/src/app/vineyeard-view/notes/notes.component.ts
+++ b/src/app/vineyeard-view/notes/notes.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
 import { NoteBase } from '../../models/note.model';
 import { NotesService } from '../../services/notes.service';
-import { Vineyard } from '../../models/vineyard.model';
+import { Vineyard, VineyardPermissions } from '../../models/vineyard.model';
 import { Vintage } from '../../models/vintage.model';
 import { AddNoteComponent } from '../add-note/add-note.component';
 import { ModalController } from '@ionic/angular';
@@ -83,4 +83,6 @@ export class NotesComponent implements OnInit, OnChanges {
       this.activeTypes = [...this.activeTypes, stage];
     }
   }
+
+  public readonly VineyardPermissions = VineyardPermissions;
 }
diff --git a/src/app/vineyeard-view/seasons/seasons.component.html b/src/app/vineyeard-view/seasons/seasons.component.html
index 6f2a45d..f92f8cf 100644
--- a/src/app/vineyeard-view/seasons/seasons.component.html
+++ b/src/app/vineyeard-view/seasons/seasons.component.html
@@ -1,5 +1,6 @@
 <ion-spinner *ngIf="loading" name="crescent"></ion-spinner>
 <div *ngIf="!loading" class="season-container">
+  <span *ngIf="info?.length === 0">No season information available</span>
   <div class="season" *ngFor="let season of info">
     <h2 class="title">{{season.year}}<span class="subtitle"> ({{season.duration}} days)</span></h2>
     <span class="date">{{season.season[0].toISOString() | date: "dd MMMM yyyy"}} - {{season.season[1].toISOString() | date: "dd MMMM yyyy"}}</span>
diff --git a/src/app/vineyeard-view/seasons/seasons.component.ts b/src/app/vineyeard-view/seasons/seasons.component.ts
index 2e0276d..34440b9 100644
--- a/src/app/vineyeard-view/seasons/seasons.component.ts
+++ b/src/app/vineyeard-view/seasons/seasons.component.ts
@@ -52,8 +52,8 @@ export class SeasonsComponent implements OnChanges {
       next: (stats: MeteoStatEntry[]) => {
         if (stats.length > 0) {
           this.calculateSeasonInfo(stats);
-          this.loading = false;
         }
+        this.loading = false;
       },
     });
     this.statService.getMeteoStats(this.vineyard);
diff --git a/src/app/vineyeard-view/vineyard-view-page.component.ts b/src/app/vineyeard-view/vineyard-view-page.component.ts
index caf835d..1308576 100644
--- a/src/app/vineyeard-view/vineyard-view-page.component.ts
+++ b/src/app/vineyeard-view/vineyard-view-page.component.ts
@@ -1,5 +1,5 @@
 import { MenuController, ModalController, NavController, Platform } from '@ionic/angular';
-import { Vineyard } from './../models/vineyard.model';
+import { Vineyard, VineyardPermissions } from './../models/vineyard.model';
 import { VineyardService } from './../services/vineyard.service';
 import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core';
 import { takeUntil } from 'rxjs/operators';
@@ -147,14 +147,14 @@ export class VineyardViewPage implements OnInit, OnDestroy, AfterViewInit {
 
     const data = await modal.onWillDismiss();
     if (data.data.vintage) {
-      this.parseVintage(data.data.vintage);
+      await this.parseVintage(data.data.vintage);
     }
   }
 
-  private parseVintage(vintage: Vintage) {
+  private async parseVintage(vintage: Vintage) {
     vintage.id
-      ? this.vintageService.updateVintage(this.activeVineyard, vintage)
-      : this.vintageService.addVintage(this.activeVineyard, vintage);
+      ? await this.vintageService.updateVintage(this.activeVineyard, vintage)
+      : await this.vintageService.addVintage(this.activeVineyard, vintage);
   }
 
   openOverview() {
@@ -170,4 +170,6 @@ export class VineyardViewPage implements OnInit, OnDestroy, AfterViewInit {
     this.openTab(MenuTab.VINTAGES);
     this.location.go(`/vineyard/view/${this.activeVineyard.id}/vintages/${vintage.id}`);
   }
+
+  protected readonly VineyardPermissions = VineyardPermissions;
 }
diff --git a/src/app/vineyeard-view/vineyard-view-routing.module.ts b/src/app/vineyeard-view/vineyard-view-routing.module.ts
index 48c82b1..dadaf9b 100644
--- a/src/app/vineyeard-view/vineyard-view-routing.module.ts
+++ b/src/app/vineyeard-view/vineyard-view-routing.module.ts
@@ -1,13 +1,15 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 import { VineyardViewPage } from './vineyard-view-page.component';
 import { BrixToAlcoholPipe } from '../pipes/brix-to-alcohol.pipe';
+import { HasPermissionsGuard } from '../shared/guards/has-permissions.guard';
 
 const routes: Routes = [
   {
     path: ':id/:tab',
     component: VineyardViewPage,
+    canActivate: [HasPermissionsGuard],
   },
   {
     path: ':id/:tab/:subId',
diff --git a/src/app/vineyeard-view/vintages/vintages.component.html b/src/app/vineyeard-view/vintages/vintages.component.html
index d26abbd..31c2757 100644
--- a/src/app/vineyeard-view/vintages/vintages.component.html
+++ b/src/app/vineyeard-view/vintages/vintages.component.html
@@ -1,13 +1,15 @@
 <div class="content-title">
     <span>Vintage</span>
-<div class="actions" *ngIf="vintage">
-    <ion-button  (click)="editVintage(vintage)">
-        <ion-icon slot="icon-only" name="create-outline"></ion-icon>
-    </ion-button>
-        <ion-button  (click)="deleteVintage(vintage)">
-            <ion-icon  slot="icon-only" name="trash-outline"></ion-icon>
-        </ion-button>
-</div>
+    <ng-container *appHasPermissions="{vineyard: vineyard, permissions: VineyardPermissions.EDIT}">
+        <div class="actions" *ngIf="vintage" >
+            <ion-button  (click)="editVintage(vintage)">
+                <ion-icon slot="icon-only" name="create-outline"></ion-icon>
+            </ion-button>
+            <ion-button  (click)="deleteVintage(vintage)">
+                <ion-icon  slot="icon-only" name="trash-outline"></ion-icon>
+            </ion-button>
+        </div>
+    </ng-container>
 </div>
 <div class="container">
     <div class="content" *ngIf="vintage">
diff --git a/src/app/vineyeard-view/vintages/vintages.component.ts b/src/app/vineyeard-view/vintages/vintages.component.ts
index de0f213..01ea98b 100644
--- a/src/app/vineyeard-view/vintages/vintages.component.ts
+++ b/src/app/vineyeard-view/vintages/vintages.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnChanges } from '@angular/core';
 import { AlertController, ModalController } from '@ionic/angular';
-import { Vineyard } from '../../models/vineyard.model';
+import { Vineyard, VineyardPermissions } from '../../models/vineyard.model';
 import { AddVintageComponent } from '../add-vintage/add-vintage.component';
-import { Vintage, VintageStatus, VINTAGE_STATUS_COLORS } from '../../models/vintage.model';
+import { Vintage, VINTAGE_STATUS_COLORS, VintageStatus } from '../../models/vintage.model';
 import { VintageService } from '../../services/vintage.service';
 import { VineyardService } from '../../services/vineyard.service';
 import { VarietyService } from '../../services/variety.service';
@@ -54,7 +54,7 @@ export class VintagesComponent implements OnChanges {
 
     const data = await modal.onWillDismiss();
     if (data.data.vintage) {
-      this.parseVintage(data.data.vintage);
+      await this.parseVintage(data.data.vintage);
     }
   }
 
@@ -73,8 +73,8 @@ export class VintagesComponent implements OnChanges {
         },
         {
           text: 'Okay',
-          handler: () => {
-            this.vintageService.removeVintage(this.vineyard, vintage);
+          handler: async () => {
+            await this.vintageService.removeVintage(this.vineyard, vintage);
           },
         },
       ],
@@ -88,22 +88,24 @@ export class VintagesComponent implements OnChanges {
     this.setTab('timeline');
   }
 
-  editVintage(vintage: Vintage) {
-    this.openAddVintageModal(vintage);
+  async editVintage(vintage: Vintage) {
+    await this.openAddVintageModal(vintage);
   }
 
-  deleteVintage(vintage: Vintage) {
-    this.openDeleteConfirm(vintage);
+  async deleteVintage(vintage: Vintage) {
+    await this.openDeleteConfirm(vintage);
   }
 
   setTab(tab: 'timeline' | 'notes') {
     this.tab = tab;
   }
 
-  private parseVintage(vintage: Vintage) {
+  private async parseVintage(vintage: Vintage): Promise<void> {
     vintage.id
-      ? this.vintageService.updateVintage(this.vineyard, vintage)
-      : this.vintageService.addVintage(this.vineyard, vintage);
+      ? await this.vintageService.updateVintage(this.vineyard, vintage)
+      : await this.vintageService.addVintage(this.vineyard, vintage);
     this.vintage = vintage;
   }
+
+  public readonly VineyardPermissions = VineyardPermissions;
 }