Index: Farmatiko/ClientApp/src/app/admin/admin.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/admin/admin.component.html	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/admin/admin.component.html	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -56,5 +56,5 @@
                 <tr *ngFor="let head of heads">
                   <td><a (click)="openPharmacyHeadDialog(head)">{{head.Name}}</a> | {{head.Email}}</td>
-                  <td><a (click)="deletePharmacyHead(head)">Delete</a> | <a (click)="openEditPharmacyHeadDialog(head)">Change</a></td>
+                  <td><a (click)="deletePharmacyHead(head)" *ngIf="head.Name !== 'Admin'">Delete</a><span *ngIf="head.Name == 'Admin'">Can't delete Admin</span> | <a (click)="openEditPharmacyHeadDialog(head)">Change</a></td>
                 </tr>
               </tbody>
Index: Farmatiko/ClientApp/src/app/admin/admin.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/admin/admin.component.ts	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/admin/admin.component.ts	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -56,9 +56,7 @@
   createHead() {
     this.dataService.insertPharmacyHead(this.head)
-        .subscribe((cHead: IPharmacyHead) => {
-          if(cHead) {
+        .subscribe((cHead) => {
             this.heads.push(cHead);
             this.openSnackBar("New head created!","OK");
-          }
         },
         (err: any) => console.log(err),
@@ -79,5 +77,8 @@
         },
         (err: any) => console.log(err),
-        () => console.log("PharmacyHead deleted"));
+        () => {
+          console.log("PharmacyHead deleted");
+          location.reload();
+        });
   }
 
@@ -88,21 +89,16 @@
     });
     dialogRef.afterClosed().subscribe((editedHead: IPharmacyHead) => {
-      if(editedHead){
-        console.log(editedHead);
-        this.heads = this.heads.filter(x => x !== eHead);
-        this.heads.push(editedHead);
-        this.dataService.updatePharmacyHead(editedHead)
-            .subscribe((hd: IPharmacyHead) => {
-              if(hd) {
-                this.openSnackBar("Success! PharmacyHead edited", "OK").onAction().subscribe(() => {
-                  window.location.reload();
-                });
-              }
-              else {
-                this.openSnackBar("PharmacyHead edit failed", "Try again");
-              }
-            },
-            (err: any) => console.log(err),
-            () => console.log('PharmacyHead data updated'));
+      if(editedHead) {
+          console.log(editedHead);
+          this.heads = this.heads.filter(x => x !== eHead);
+          this.heads.push(editedHead);
+          this.dataService.updatePharmacyHead(editedHead)
+              .subscribe((hd: IPharmacyHead) => {
+                  this.openSnackBar("Success! PharmacyHead edited", "OK").onAction().subscribe(() => {
+                    location.reload();
+                  });
+              },
+              (err: any) => console.log(err),
+              () => console.log('PharmacyHead data updated'));
       }
     });
@@ -127,12 +123,12 @@
         .subscribe((status: boolean) => {
           if(status) {
-            this.openSnackBar("Request rejected!","OK");
-          }
-          else {
-            this.openSnackBar("Something went wrong","Try again");
+            this.openSnackBar("Request processed!","OK");
           }
         },
         (err: any) => console.log(err),
-        () => console.log("PharmacyHeadRequest deleted"));
+        () => {
+          console.log("PharmacyHeadRequest deleted");
+          location.reload();
+        });
   }
 
@@ -148,5 +144,8 @@
         },
         (err: any) => console.log(err),
-        () => console.log("PharmacyHead updated"))
+        () => {
+          console.log("PharmacyHead updated");
+          location.reload();
+        })
     }
   }
Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/counter/counter.component.ts	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/counter/counter.component.ts	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -83,5 +83,5 @@
     }
     facils.forEach((facil) => {
-      this.http.get<any>('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+facil.municipality+'&street='+facil.address+'&format=json').subscribe(obj => {
+      this.http.get<any>('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+facil.municipality+'&street='+facil.address+'&format=json').subscribe(obj => {
         console.log(obj);  
         if(obj.length) {
Index: Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -60,8 +60,5 @@
             .subscribe((req) => {
               if(req) {
-                this.openSnackBar("Claiming request sent!", "OK");
-              }
-              else {
-                this.openSnackBar("Unable to send a request", "Try again");
+                this.openSnackBar("Request sent!", "OK");
               }
             },
@@ -78,8 +75,5 @@
             .subscribe((req) => {
               if(req) {
-                this.openSnackBar("Claiming request sent!", "OK");
-              }
-              else {
-                this.openSnackBar("Unable to send a request", "Try again");
+                this.openSnackBar("Request sent!", "OK");
               }
             },
@@ -98,14 +92,12 @@
   saveDeletedMedicines() {
     this.dataService.updatePharmacyHead(this.head)
-      .subscribe((hd) => {
-        if(hd) {
-          this.openSnackBar("Success! Medicine deleted", "OK");
+      .subscribe(() => {
+          this.openSnackBar("Success!", "OK");
           this.editedMedicine = false;
-        }
-        else {
-          this.openSnackBar("Unable to delete Medicine", "Try again");
-        }
       },
-      (err: any) => console.log(err),
+      (err: any) => {
+        console.log(err);
+        this.openSnackBar("Failed!", "Try again");
+      },
       () => console.log('Update sent!'));
   }
@@ -132,8 +124,5 @@
           this.editedMedicine = true;
         }
-        this.openSnackBar("Success! Medicine added, please save changes now", "OK");
-      }
-      else {
-        this.openSnackBar("Failed! Please try again", "OK");
+        this.openSnackBar("Success!", "OK");
       }
     }, () => this.openSnackBar("Failed! Please try again", "OK"));
@@ -160,8 +149,5 @@
           this.editedMedicine = true;
         }
-        this.openSnackBar("Success! Medicines added, please save changes now", "OK");
-      }
-      else {
-        this.openSnackBar("Failed! Please try again", "OK");
+        this.openSnackBar("Success!", "OK");
       }
     }, () => this.openSnackBar("Failed! Please try again", "OK"));
@@ -215,13 +201,8 @@
         this.head.Pharmacy.push(editedPharmacy);
         this.dataService.updatePharmacyHead(this.head)
-            .subscribe((hd: IPharmacyHead) => {
-              if(hd) {
-                this.openSnackBar("Success! Pharmacy edited", "OK").onAction().subscribe(() => {
+            .subscribe((hd) => {
+                this.openSnackBar("Success!", "OK").onAction().subscribe(() => {
                   window.location.reload();
                 });
-              }
-              else {
-                this.openSnackBar("Pharmacy edit failed", "Try again");
-              }
             },
             (err: any) => console.log(err),
Index: Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -32,5 +32,5 @@
 
   addMarkers() {
-    this.http.get<any>('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.facility?.municipality+'&street='+this.facility?.address+'&format=json').subscribe(obj => {
+    this.http.get<any>('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.facility?.municipality+'&street='+this.facility?.address+'&format=json').subscribe(obj => {
       console.log(obj);  
       if(obj.length) {
Index: Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -32,5 +32,5 @@
 
   addMarkers() {
-    this.http.get<any>('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.pharmacy?.location+'&street='+this.pharmacy?.address+'&format=json').subscribe(obj => {
+    this.http.get<any>('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.pharmacy?.location+'&street='+this.pharmacy?.address+'&format=json').subscribe(obj => {
       console.log(obj);  
       if(obj.length) {
Index: Farmatiko/ClientApp/src/app/home/home.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.ts	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/home/home.component.ts	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -82,5 +82,5 @@
     }
     pharmas.forEach((pharmacy) => {
-      this.http.get<any>('https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+pharmacy.location+'&street='+pharmacy.address+'&format=json').subscribe(obj => {
+      this.http.get<any>('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+pharmacy.location+'&street='+pharmacy.address+'&format=json').subscribe(obj => {
         console.log(obj);  
         if(obj.length) {
Index: Farmatiko/ClientApp/src/app/shared/interfaces.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/interfaces.ts	(revision e0cdea28ddbdd8eaa0bc76096a6d1c61299ef820)
+++ Farmatiko/ClientApp/src/app/shared/interfaces.ts	(revision dae4cde3555354dd3018b5f0ff1aa01b052525ea)
@@ -64,3 +64,3 @@
     PharmacyHead?: IPharmacyHead;
     Pharmacy?: IPharmacy;
-}  
+}