Index: src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -18,6 +18,6 @@
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(reg -> reg
-                        .requestMatchers("/", "/login", "/register", "/error", "/css/**", "/js/**", "/uploads/**", "/logo.png", "catalog").permitAll()
-                        .requestMatchers("/admin/branded-medicines/**").hasAnyRole("ADMIN","PHARMACIST")
+                        .requestMatchers("/", "/login", "/register", "/error", "/css/**", "/js/**", "/uploads/**", "/logo.png", "/catalog").permitAll()
+                        .requestMatchers("/admin/branded-medicines/**", "/admin/companies/3/facilities/**").hasAnyRole("ADMIN","PHARMACIST")
                         .requestMatchers("/admin/**").hasRole("ADMIN")
                                 .requestMatchers("/pharmacist/**").hasRole("PHARMACIST")
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/CatalogServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/CatalogServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/CatalogServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -42,8 +42,6 @@
         Set<Integer> desired = brandedMedicineIds == null ? Set.of() : new HashSet<>(brandedMedicineIds);
 
-        // Current
         Set<Integer> current = listCatalogMedicineIds(pharmacyId);
 
-        // To add and to remove
         Set<Integer> toAdd = new HashSet<>(desired);
         toAdd.removeAll(current);
@@ -52,5 +50,4 @@
         toRemove.removeAll(desired);
 
-        // Add
         if (!toAdd.isEmpty()) {
             Pharmacy pharmacy = pharmacyRepo.findById(pharmacyId)
@@ -68,5 +65,4 @@
         }
 
-        // Remove
         for (Integer bmId : toRemove) {
             catalogRepo.deleteByPharmacy_IdAndBrandedMedicine_Id(pharmacyId, bmId);
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/ClientServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/ClientServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/ClientServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -22,5 +22,4 @@
     @Override
     public List<Client> findClientsWithoutHealthProfileByName(String searchTerm) {
-        // ensure case-insensitive search by wrapping with %...%
         String term = "%" + searchTerm.toLowerCase() + "%";
         return clientRepository.findClientsWithoutHealthProfileByName(term);
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyOrchestrationServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyOrchestrationServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyOrchestrationServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -38,9 +38,8 @@
                 }
             } catch (DataIntegrityViolationException ignore) {
-                // idempotent add if another request just created the row under a unique/PK constraint
             }
         }
         return c;
-    } // service-level transaction boundary covers the whole use case [1][6]
+    }
 
     @Override
@@ -60,5 +59,5 @@
         requested.addAll(requestedRoles);
 
-        if (current.equals(requested)) return; // no-op on unchanged roles
+        if (current.equals(requested)) return;
 
         // Adds
@@ -73,10 +72,9 @@
                     }
                 } catch (DataIntegrityViolationException ignore) {
-                    // safe duplicate under unique/PK
                 }
             }
         }
 
-        // Removes
+        //
         for (CompanyRoleType r : current) {
             if (!requested.contains(r)) {
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/ContactInformationServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/ContactInformationServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/ContactInformationServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -24,5 +24,4 @@
     private final FacilityRepository facilityRepo;
 
-    // User-scoped
     @Override @Transactional(readOnly = true)
     public List<Contactinformation> listForUser(Integer userId) {
@@ -57,5 +56,4 @@
     }
 
-    // Facility-scoped
     @Override @Transactional(readOnly = true)
     public List<Contactinformation> listForFacility(Integer facilityId) {
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/DeliveryCompanyServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/DeliveryCompanyServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/DeliveryCompanyServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -46,5 +46,4 @@
 
         Deliverycompany dc = new Deliverycompany();
-        // If Deliverycompany uses @MapsId on its company mapping, this copies company.id into deliverycompany.id
         dc.setCompany(company);
 
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/DistributorServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/DistributorServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/DistributorServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -44,5 +44,5 @@
                 .orElseThrow(() -> new EntityNotFoundException("Company not found: " + companyId));
         Distributor d = new Distributor();
-        d.setCompany(company); // @MapsId copies company.id into distributor.id
+        d.setCompany(company);
         return distributorRepository.save(d);
     }
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/FacilityServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/FacilityServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/FacilityServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -14,5 +14,4 @@
 
 @Service
-@Transactional
 public class FacilityServiceImpl implements FacilityService {
 
@@ -35,5 +34,4 @@
     }
 
-    @Transactional
     @Override
     public Optional<Facility> findById(Integer id) {
@@ -41,5 +39,4 @@
     }
 
-    @Transactional
     @Override
     public List<Facility> findAllByCompany(Integer companyId) {
@@ -47,5 +44,4 @@
     }
 
-    @Transactional
     @Override
     public List<Facility> findAll() {
@@ -53,4 +49,5 @@
     }
 
+    @Transactional
     @Override
     public Facility create(Integer companyId, String facilityName, String code) {
@@ -65,4 +62,5 @@
     }
 
+    @Transactional
     @Override
     public Facility update(Integer id, String facilityName, String code) {
@@ -73,4 +71,5 @@
     }
 
+    @Transactional
     @Override
     public void delete(Integer id) {
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/HealthProfileServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/HealthProfileServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/HealthProfileServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -24,5 +24,4 @@
     @Override
     public Healthprofile createForClient(Client client, String bloodType) {
-        // TODO: 28.8.2025 Check if the client already has a health profile
 
         Healthprofile profile = new Healthprofile();
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/ManufacturerServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/ManufacturerServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/ManufacturerServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -44,5 +44,5 @@
                 .orElseThrow(() -> new EntityNotFoundException("Company not found: " + companyId));
         Manufacturer m = new Manufacturer();
-        m.setCompany(company); // @MapsId copies company.id into manufacturer.id
+        m.setCompany(company);
         return manufacturerRepository.save(m);
     }
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/PharmacyServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/PharmacyServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/PharmacyServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -44,5 +44,5 @@
                 .orElseThrow(() -> new EntityNotFoundException("Company not found: " + companyId));
         Pharmacy p = new Pharmacy();
-        p.setCompany(company); // @MapsId copies company.id into pharmacy.id
+        p.setCompany(company);
         return pharmacyRepository.save(p);
     }
Index: src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -41,5 +41,4 @@
         }
 
-        // TODO: 30.8.2025 stock check with trigger
 
         cartMedicineRepo.save(entry);
Index: src/main/java/mk/ukim/finki/synergymed/web/CatalogController.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/web/CatalogController.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/web/CatalogController.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,6 +1,9 @@
 package mk.ukim.finki.synergymed.web;
 
+import jakarta.persistence.EntityNotFoundException;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
+import mk.ukim.finki.synergymed.models.Brandedmedicine;
+import mk.ukim.finki.synergymed.models.Brandedmedicineimage;
 import mk.ukim.finki.synergymed.service.BrandedMedicineService;
 import mk.ukim.finki.synergymed.service.CatalogService;
@@ -9,8 +12,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RequiredArgsConstructor
@@ -44,8 +46,17 @@
         return "catalog-edit";
     }
+    @GetMapping("/{id}")
+    public String details(@PathVariable Integer id, Model model) {
+        Brandedmedicine bm = brandedMedicineService.findById(id)
+                .orElseThrow(() -> new EntityNotFoundException("Branded medicine not found: " + id));
+        List<Brandedmedicineimage> images = brandedMedicineService.listImages(id);
+        model.addAttribute("bm", bm);
+        model.addAttribute("images", images);
+        return "branded-medicine-details";
+    }
 
     @PreAuthorize("hasAnyRole('ADMIN','PHARMACIST')")
     @PostMapping("/edit")
-    public String saveEdit(@RequestParam(name="ids", required=false) java.util.List<Integer> ids) {
+    public String saveEdit(@RequestParam(name="ids", required=false) List<Integer> ids) {
         catalogService.setCatalog(3, ids);
         return "redirect:/catalog";
Index: src/main/java/mk/ukim/finki/synergymed/web/CompanyController.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/web/CompanyController.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/web/CompanyController.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -40,5 +40,5 @@
         model.addAttribute("rolesByCompany", rolesByCompany);
         return "companies";
-    } // thin controller; business logic stays in services [7][1]
+    }
 
     @GetMapping("/new")
@@ -47,5 +47,5 @@
         model.addAttribute("mode", "create");
         return "company-form";
-    } // uses enum values for consistent binding [5][2]
+    }
 
     @PostMapping
@@ -58,5 +58,5 @@
         );
         return "redirect:/admin/companies";
-    } // delegates creation and role adds to service [1][6]
+    }
 
     @GetMapping("/{id}/edit")
@@ -74,5 +74,5 @@
         model.addAttribute("mode", "edit");
         return "company-form";
-    } // pre-checks include delivery subtype [5][4]
+    }
 
     @PostMapping("/{id}/update")
@@ -86,5 +86,5 @@
         );
         return "redirect:/admin/companies";
-    } // thin endpoint; service owns @Transactional set-diff [1][6]
+    }
 
     @PostMapping("/{id}/delete")
@@ -92,4 +92,4 @@
         companyService.deleteById(id);
         return "redirect:/admin/companies";
-    } // deletion outside the role logic [1][6]
+    }
 }
Index: src/main/java/mk/ukim/finki/synergymed/web/FacilityController.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/web/FacilityController.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/web/FacilityController.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -23,5 +23,4 @@
     private final ContactInformationService contactInformationService;
 
-    // Grid of facilities for a company
     @GetMapping
     public String index(@PathVariable Integer companyId, Model model) {
@@ -96,5 +95,4 @@
     }
 
-    // Contact Info: show/create/update/delete (single contact)
     @GetMapping("/{id}/contacts")
     public String facilityContacts(@PathVariable Integer companyId,
Index: src/main/java/mk/ukim/finki/synergymed/web/GlobalModelAttributes.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/web/GlobalModelAttributes.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/web/GlobalModelAttributes.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,8 +1,10 @@
 package mk.ukim.finki.synergymed.web;
+
+import jakarta.servlet.http.HttpSession;
 
 @org.springframework.web.bind.annotation.ControllerAdvice
 public class GlobalModelAttributes {
     @org.springframework.web.bind.annotation.ModelAttribute
-    public void addSessionUser(org.springframework.ui.Model model, jakarta.servlet.http.HttpSession session) {
+    public void addSessionUser(org.springframework.ui.Model model, HttpSession session) {
         Object u = session.getAttribute("user");
         Object name = session.getAttribute("username");
Index: src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -31,6 +31,6 @@
     private final DeliveryCompanyService deliveryCompanyService;
     private final ClientService clientService;
-    private final UserRepository userRepository;          // from repo auth
-    private final ClubCardService clubCardService;        // from local logic
+    private final UserRepository userRepository;
+    private final ClubCardService clubCardService;
 
     private User getCurrentUser(UserDetails ud) {
@@ -43,10 +43,8 @@
                                  @AuthenticationPrincipal UserDetails ud,
                                  Model model) {
-        // Resolve current user/client using repo auth strategy
         User user = getCurrentUser(ud);
         Client client = clientService.findClientById(user.getId());
         Shoppingcart cart = shoppingCartService.getOrCreateCart(client);
 
-        // Local discount logic with club card
         int base = shoppingCartService.getTotal(cart).intValue();
         int discount = 0;
@@ -76,10 +74,8 @@
                                  @RequestParam(name = "useCard", defaultValue = "false") boolean useCard,
                                  Model model) {
-        // Resolve current user/client using repo auth strategy
         User user = getCurrentUser(ud);
         Client client = clientService.findClientById(user.getId());
         Shoppingcart cart = shoppingCartService.getOrCreateCart(client);
 
-        // Pass useCard through to service as in local logic
         Clientorder order = paymentService.checkout(client, cart, paymentMethodId, deliveryCompanyId, useCard);
 
Index: src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -17,4 +17,6 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
 
 @Controller
@@ -99,5 +101,4 @@
     }
 
-    // in ShoppingCartController
     @GetMapping
     public String showCart(Model model, @AuthenticationPrincipal UserDetails ud) {
@@ -110,5 +111,5 @@
         model.addAttribute("username", ud.getUsername());
 
-        var meds = new java.util.ArrayList<>(items.keySet());
+        var meds = new ArrayList<>(items.keySet());
         var firstImageById = brandedmedicineService.cardImageUrlsFor(meds);
         model.addAttribute("firstImageById", firstImageById);
Index: src/main/java/mk/ukim/finki/synergymed/web/SupplyOrderController.java
===================================================================
--- src/main/java/mk/ukim/finki/synergymed/web/SupplyOrderController.java	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/java/mk/ukim/finki/synergymed/web/SupplyOrderController.java	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,3 +1,2 @@
-// src/main/java/mk/ukim/finki/synergymed/web/SupplyOrderController.java
 package mk.ukim.finki.synergymed.web;
 
@@ -31,5 +30,4 @@
         List<Distributor> distributors = distributorRepository.findAll();
 
-        // Preload facilities per pharmacy (by pharmacy.company.id)
         Map<Integer, List<Facility>> facilitiesByPharmacyId = new HashMap<>();
         for (Pharmacy p : pharmacies) {
@@ -39,5 +37,4 @@
         }
 
-        // Preload medicines per distributor
         Map<Integer, List<Brandedmedicine>> medicinesByDistributorId = new HashMap<>();
         for (Distributor d : distributors) {
@@ -50,5 +47,5 @@
         model.addAttribute("facilitiesByPharmacyId", facilitiesByPharmacyId);
         model.addAttribute("medicinesByDistributorId", medicinesByDistributorId);
-        return "supplyorder"; // Thymeleaf template below
+        return "supplyorder";
     }
 
Index: src/main/resources/templates/add-medicine-interaction.html
===================================================================
--- src/main/resources/templates/add-medicine-interaction.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/add-medicine-interaction.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -27,6 +27,6 @@
             margin:0;
             z-index:1000;
-            background:white !important; /* Force white background */
-            box-shadow:0 2px 10px rgba(0,0,0,0.1); /* Add subtle shadow */
+            background:white !important;
+            box-shadow:0 2px 10px rgba(0,0,0,0.1);
         }
 
@@ -37,4 +37,18 @@
         .header-content h1 { font-size:2.2rem; font-weight:300; margin-bottom:10px; }
         .header-content p { font-size:1rem; opacity:.9; }
+
+        /* Header action row */
+        .header-buttons {
+            margin-top:14px;
+            display:flex;
+            justify-content:center;
+        }
+        .btn-back{
+            display:inline-flex; align-items:center; justify-content:center;
+            padding:10px 16px; border-radius:12px; font-weight:700; text-decoration:none; cursor:pointer;
+            background:#ffffff; color:#20b2aa; border:2px solid rgba(32,178,170,.25);
+            transition:transform .15s ease, box-shadow .15s ease, border-color .15s ease, background .15s ease;
+        }
+        .btn-back:hover{ transform:translateY(-1px); box-shadow:0 8px 18px rgba(0,0,0,.10); border-color:#20b2aa; background:#f8fffe; }
 
         .card { background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; margin-bottom:30px; }
@@ -50,37 +64,20 @@
         .btn-submit:active { transform:translateY(0); }
 
-        /* Alerts */
         .alert { padding:15px; border-radius:12px; margin-bottom:20px; font-size:.9rem; }
         .alert-danger { background-color:#fee; color:#c33; border:1px solid #fcc; }
         .alert-success { background-color:#efe; color:#363; border:1px solid #cfc; }
 
-        /* Severity fancy buttons */
         .severity-options { display:flex; gap:20px; justify-content:space-between; margin-top:15px; }
         .severity-option { flex:1; }
         .severity-option input { display:none; }
         .severity-label {
-            display:block;
-            padding:15px;
-            border-radius:12px;
-            text-align:center;
-            cursor:pointer;
-            font-weight:700;
-            text-transform:uppercase;
-            transition:all .3s ease;
-            border:2px solid transparent;
-            font-size:0.95rem;
-            letter-spacing:1px;
+            display:block; padding:15px; border-radius:12px; text-align:center; cursor:pointer; font-weight:700;
+            text-transform:uppercase; transition:all .3s ease; border:2px solid transparent; font-size:0.95rem; letter-spacing:1px;
             box-shadow:0 4px 8px rgba(0,0,0,0.08);
         }
-
         .severity-low    { background:linear-gradient(135deg,#d1ecf1,#b3e6f0); color:#0c5460; border-color:#0c5460; }
         .severity-medium { background:linear-gradient(135deg,#fff3cd,#ffe082); color:#856404; border-color:#856404; }
         .severity-high   { background:linear-gradient(135deg,#f8d7da,#f5b7b1); color:#721c24; border-color:#721c24; }
-
-        .severity-option input:checked + .severity-label {
-            transform:scale(1.07);
-            box-shadow:0 0 15px rgba(0,0,0,0.25);
-            border-width:3px;
-        }
+        .severity-option input:checked + .severity-label { transform:scale(1.07); box-shadow:0 0 15px rgba(0,0,0,0.25); border-width:3px; }
     </style>
 </head>
@@ -96,4 +93,13 @@
             <h1>Додади интеракција</h1>
             <p>Избери два различни лека и дефинирај ја нивната интеракција</p>
+
+            <!-- Back button under the heading and description -->
+            <div class="header-buttons">
+                <a class="btn-back"
+                   href="http://localhost:8080/pharmacist/medicine/interactions"
+                   th:href="@{/pharmacist/medicine/interactions}">
+                    Назад
+                </a>
+            </div>
         </div>
     </div>
@@ -112,5 +118,4 @@
         <div class="card-body">
             <form th:action="@{/pharmacist/medicine/interactions/add}" method="post">
-
                 <div class="form-group">
                     <label for="medicine1Id">Прв лек</label>
Index: src/main/resources/templates/branded-medicine-details.html
===================================================================
--- src/main/resources/templates/branded-medicine-details.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
+++ src/main/resources/templates/branded-medicine-details.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -0,0 +1,285 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" lang="mk">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title th:text="${bm != null ? 'Брендиран лек – ' + bm.name : 'Брендиран лек'}">SynergyMed – Брендиран лек</title>
+
+    <!-- Global header styles (fragment) -->
+    <th:block th:replace="~{fragments/header :: headerStyles}"></th:block>
+
+    <!-- Page styles (override header after fragment import) -->
+    <style>
+        /* Keep the global header flat and sticky at the top */
+        .site-header{
+            position: sticky;
+            top: 0; left: 0; right: 0; width: 100%;
+            z-index: 1000;
+            border-radius: 0;
+            background: #ffffff !important;
+            box-shadow: 0 2px 10px rgba(0,0,0,.10);
+        }
+
+        :root {
+            --teal-1:#20b2aa; --teal-2:#48d1cc;
+            --muted:#6b7280; --text:#1f2937;
+            --shadow:0 20px 40px rgba(0,0,0,0.10);
+            --shadow-sm:0 6px 18px rgba(0,0,0,0.08);
+        }
+
+        *{margin:0;padding:0;box-sizing:border-box}
+        body{
+            font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            min-height:100vh;
+            background:linear-gradient(135deg,#a4ecba 0%, #f7f7f8 100%);
+            color:var(--text);
+        }
+
+        .page{max-width:1200px; margin:0 auto; padding:24px}
+
+        .card{background:#fff; border-radius:18px; box-shadow:var(--shadow); overflow:hidden; margin-bottom:28px}
+        .card-header{
+            background:linear-gradient(135deg,var(--teal-1),var(--teal-2));
+            color:#fff; padding:20px 24px; display:flex; align-items:center; justify-content:space-between;
+            font-size:1.25rem; font-weight:700;
+        }
+        .card-body{padding:22px}
+
+        .grid{
+            display:grid;
+            grid-template-columns: 1.15fr 0.85fr;
+            gap:22px;
+            align-items:start;
+        }
+
+        /* Gallery */
+        .gallery{
+            display:flex; flex-direction:column; gap:10px;
+        }
+        .viewport{
+            position:relative;
+            overflow-x:auto; overflow-y:hidden;
+            display:flex; gap:10px; scroll-behavior:smooth;
+            scroll-snap-type:x mandatory; /* enable horizontal snap */
+            border-radius:14px; box-shadow:var(--shadow-sm); background:#fff;
+        }
+        .slide{
+            flex:0 0 100%;
+            scroll-snap-align:center; /* each slide centers on snap */
+            position:relative;
+            aspect-ratio: 4 / 3;
+            background:#f3f4f6;
+            display:grid; place-items:center;
+        }
+        .slide img{width:100%; height:100%; object-fit:cover; display:block; border-radius:14px}
+
+        .controls{
+            display:flex; justify-content:space-between; gap:10px; align-items:center;
+        }
+        .pager{
+            display:flex; gap:6px; align-items:center; justify-content:center; flex:1;
+        }
+        .dot{
+            width:10px; height:10px; border-radius:50%;
+            background:#d1d5db; border:1px solid #e5e7eb;
+        }
+        .dot[aria-current="true"]{ background:#20b2aa; border-color:#20b2aa }
+
+        .ctrl-btn{
+            display:inline-flex; align-items:center; justify-content:center;
+            width:40px; height:40px; border-radius:10px;
+            background:#ffffff; border:1px solid rgba(0,0,0,.12);
+            cursor:pointer; transition:.15s ease; color:#111827;
+        }
+        .ctrl-btn:hover{ box-shadow:0 6px 14px rgba(0,0,0,.10) }
+
+        /* Details */
+        .meta{display:grid; grid-template-columns:1fr; gap:14px}
+        .row{display:flex; gap:10px; align-items:baseline; flex-wrap:wrap}
+        .label{min-width:160px; color:var(--muted); font-weight:600}
+        .value{font-weight:700}
+        .desc{white-space:pre-wrap; line-height:1.6}
+
+        .price{
+            font-size:1.6rem; font-weight:800;
+            background:linear-gradient(135deg,var(--teal-1),var(--teal-2));
+            -webkit-background-clip:text; background-clip:text; color:transparent;
+        }
+
+        .actions{display:flex; gap:10px; margin-top:16px; flex-wrap:wrap}
+        .btn{
+            display:inline-flex; align-items:center; gap:8px;
+            padding:10px 14px; border-radius:12px; font-weight:700; text-decoration:none; cursor:pointer;
+            transition:transform .15s ease, box-shadow .15s ease, background .15s ease, border-color .15s ease, color .15s ease;
+        }
+        .btn-primary{ background:linear-gradient(135deg,var(--teal-1),var(--teal-2)); color:#fff; box-shadow:0 10px 20px rgba(32,178,170,.25); border:none }
+        .btn-outline{ background:#fff; color:#20b2aa; border:2px solid rgba(32,178,170,.25) }
+        .btn:hover{ transform: translateY(-1px); box-shadow:0 8px 18px rgba(0,0,0,.10) }
+
+        @media (max-width: 900px){
+            .grid{ grid-template-columns:1fr; }
+            .label{min-width:120px}
+        }
+    </style>
+</head>
+<body>
+<!-- Global header -->
+<th:block th:replace="~{fragments/header :: siteHeader('Каталог')}"></th:block>
+
+<div class="page">
+    <div class="card">
+        <div class="card-header">
+        <span>
+          <span th:text="${bm.name}">Име на лек</span>
+        </span>
+            <a class="btn btn-outline" th:href="@{/catalog}">← Назад кон листата</a>
+        </div>
+
+        <div class="card-body">
+            <div class="grid">
+                <!-- Gallery -->
+                <section class="gallery"
+                         role="region"
+                         aria-roledescription="carousel"
+                         aria-label="Галерија слики за лек"
+                         aria-live="polite">
+                    <div class="viewport" id="viewport">
+                        <!-- Slides -->
+                        <div class="slide" th:each="img,iter : ${images}">
+                            <img th:src="@{${img.image}}" alt="Слика [[${iter.index + 1}]]">
+                        </div>
+                        <!-- Fallback if нема слики -->
+                        <div class="slide" th:if="${images == null or #lists.isEmpty(images)}">
+                            <img src="/images/placeholder.png" alt="Нема слика">
+                        </div>
+                    </div>
+
+                    <div class="controls" aria-label="Контроли на галеријата">
+                        <button type="button" class="ctrl-btn" id="prevBtn" aria-label="Претходна слика">◀</button>
+                        <div class="pager" id="pager" aria-label="Слајдови"></div>
+                        <button type="button" class="ctrl-btn" id="nextBtn" aria-label="Следна слика">▶</button>
+                    </div>
+                </section>
+
+                <!-- Details -->
+                <section class="details" aria-label="Детали за лек">
+                    <div class="meta">
+                        <div class="row">
+                            <div class="label">Назив</div>
+                            <div class="value" th:text="${bm.name}">Име</div>
+                        </div>
+                        <div class="row">
+                            <div class="label">Производител</div>
+                            <div class="value"
+                                 th:text="${
+                        bm.manufacturer != null && bm.manufacturer.company != null
+                        ? bm.manufacturer.company.companyName : '—'
+                     }">Компанија</div>
+                        </div>
+                        <div class="row">
+                            <div class="label">Цена</div>
+                            <div class="price"
+                                 th:text="${#numbers.formatDecimal(bm.price,1,'COMMA',2,'POINT')} + ' ден.'">0,00 ден.</div>
+                        </div>
+                        <div class="row">
+                            <div class="label">Форма</div>
+                            <div class="value" th:text="${bm.dosageForm}">Таблети</div>
+                        </div>
+                        <div class="row">
+                            <div class="label">Јачина</div>
+                            <div class="value" th:text="${bm.strength}">500 mg</div>
+                        </div>
+                        <div class="row">
+                            <div class="label">Земја на потекло</div>
+                            <div class="value" th:text="${bm.originCountry != null ? bm.originCountry : '—'}">Македонија</div>
+                        </div>
+                        <div class="row">
+                            <div class="label">Опис</div>
+                            <div class="desc" th:text="${bm.description != null ? bm.description : 'Нема опис.'}">Опис...</div>
+                        </div>
+
+                        <div class="actions">
+                            <!-- Example client action; gate with role if needed -->
+                            <form th:action="@{/cart/add/{id}(id=${bm.id})}" method="post" style="display:inline;">
+                                <input type="hidden" th:if="${_csrf != null}" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
+                                <button type="submit" class="btn btn-primary" sec:authorize="hasRole('CLIENT')">Додај во кошничка</button>
+                            </form>
+                        </div>
+                    </div>
+                </section>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Header dropdown behavior (fragment) -->
+<th:block th:replace="~{fragments/header :: headerScripts}"></th:block>
+
+<script>
+    (function(){
+        const vp   = document.getElementById('viewport');
+        const prev = document.getElementById('prevBtn');
+        const next = document.getElementById('nextBtn');
+        const pager= document.getElementById('pager');
+
+        const slides = Array.from(vp.querySelectorAll('.slide'));
+        const slideCount = slides.length;
+        let idx = 0;
+
+        function buildDots(){
+            pager.innerHTML = '';
+            for(let i=0;i<slideCount;i++){
+                const d = document.createElement('button');
+                d.className = 'dot';
+                d.type = 'button';
+                d.setAttribute('aria-label', `Слајд ${i+1} од ${slideCount}`);
+                d.setAttribute('aria-current', i===idx ? 'true' : 'false');
+                d.addEventListener('click', ()=>scrollToIndex(i));
+                pager.appendChild(d);
+            }
+        }
+
+        function updateAria(){
+            slides.forEach((s, i)=>{
+                s.setAttribute('aria-hidden', i===idx ? 'false' : 'true');
+                s.toggleAttribute('aria-current', i===idx);
+            });
+            Array.from(pager.children).forEach((dot,i)=>{
+                dot.setAttribute('aria-current', i===idx ? 'true' : 'false');
+            });
+        }
+
+        function scrollToIndex(i){
+            if (i<0 || i>=slideCount) return;
+            idx = i;
+            slides[i].scrollIntoView({behavior:'smooth', inline:'center', block:'nearest'});
+            updateAria();
+        }
+
+        function nearestIndex(){
+            const vw = vp.clientWidth;
+            const x  = vp.scrollLeft;
+            return Math.round(x / vw);
+        }
+
+        prev?.addEventListener('click', ()=>scrollToIndex(idx-1));
+        next?.addEventListener('click', ()=>scrollToIndex(idx+1));
+
+        vp?.addEventListener('scroll', ()=>{
+            const n = nearestIndex();
+            if (n !== idx){ idx = n; updateAria(); }
+        }, {passive:true});
+
+        // Keyboard support
+        vp?.addEventListener('keydown', (e)=>{
+            if (e.key === 'ArrowRight') { e.preventDefault(); scrollToIndex(idx+1); }
+            if (e.key === 'ArrowLeft')  { e.preventDefault(); scrollToIndex(idx-1); }
+        });
+
+        // Init
+        buildDots();
+        updateAria();
+    })();
+</script>
+</body>
+</html>
Index: src/main/resources/templates/branded-medicine-form.html
===================================================================
--- src/main/resources/templates/branded-medicine-form.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/branded-medicine-form.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -96,5 +96,5 @@
 
 <!-- Global header (fragment with parameters) -->
-<th:block th:replace="fragments/header :: siteHeader('medicines')"></th:block>
+<th:block th:replace="fragments/header :: siteHeader('Брендирани лекови')"></th:block>
 
 <div class="page">
Index: src/main/resources/templates/catalog-edit.html
===================================================================
--- src/main/resources/templates/catalog-edit.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/catalog-edit.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -29,5 +29,5 @@
 </head>
 <body>
-<th:block th:replace="fragments/header :: siteHeader('medicines')"></th:block>
+<th:block th:replace="fragments/header :: siteHeader('Каталог')"></th:block>
 
 <div class="page">
Index: src/main/resources/templates/catalog.html
===================================================================
--- src/main/resources/templates/catalog.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/catalog.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -23,4 +23,5 @@
         .item{background:#fff;border-radius:16px;box-shadow:var(--shadow-sm);overflow:hidden;display:flex;flex-direction:column}
         .thumb{width:100%;height:160px;object-fit:cover;display:block}
+        .thumb-link{display:block; line-height:0}
         .content{padding:14px 16px;display:flex;flex-direction:column;gap:10px}
         .title{font-weight:700;margin-bottom:4px}
@@ -38,5 +39,5 @@
 </head>
 <body>
-<th:block th:replace="fragments/header :: siteHeader('medicines')"></th:block>
+<th:block th:replace="fragments/header :: siteHeader('Каталог')"></th:block>
 
 <div class="toast-container" id="toastContainer"></div>
@@ -52,6 +53,10 @@
             <div class="grid" th:unless="${#lists.isEmpty(medicines)}">
                 <div class="item" th:each="m : ${medicines}">
-                    <img class="thumb" th:if="${firstImageById != null}" th:src="${firstImageById[m.id]}" alt="слика">
-                    <img class="thumb" th:if="${firstImageById == null}" src="/images/default-medicine.png" alt="слика">
+                    <!-- Wrap the image in a link to details /catalog/{id} -->
+                    <a class="thumb-link" th:href="@{/catalog/{id}(id=${m.id})}" aria-label="Детали за [[${m.name}]]">
+                        <img class="thumb" th:if="${firstImageById != null}" th:src="${firstImageById[m.id]}" alt="слика">
+                        <img class="thumb" th:if="${firstImageById == null}" src="/images/default-medicine.png" alt="слика">
+                    </a>
+
                     <div class="content">
                         <div>
@@ -60,8 +65,12 @@
                         </div>
                         <div class="price" th:text="${#numbers.formatDecimal(m.price, 1, 'COMMA', 2, 'POINT') + ' ден.'}">0.00 ден.</div>
-                        <form th:action="@{/cart/add/{id}(id=${m.id})}" method="post" style="display:inline;">
-                            <input type="hidden" th:if="${_csrf != null}" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
-                            <button type="submit" sec:authorize="hasRole('CLIENT')" class="btn-outline add-to-cart-btn" th:data-name="${m.name}">Додај во кошничка</button>
-                        </form>
+
+                        <div style="display:flex; gap:8px; align-items:center;">
+                            <a class="btn-outline" th:href="@{/catalog/{id}(id=${m.id})}">Детали</a>
+                            <form th:action="@{/cart/add/{id}(id=${m.id})}" method="post" style="display:inline;">
+                                <input type="hidden" th:if="${_csrf != null}" th:name="${_csrf.parameterName}" th:value="${_csrf.token}">
+                                <button type="submit" sec:authorize="hasRole('CLIENT')" class="btn-outline add-to-cart-btn" th:data-name="${m.name}">Додај во кошничка</button>
+                            </form>
+                        </div>
                     </div>
                 </div>
@@ -92,5 +101,4 @@
     function removeToast(t){ t.classList.remove('show'); setTimeout(()=>t?.parentElement?.removeChild(t),300); }
 
-    // FormData + same-origin credentials + redirect-aware success
     document.addEventListener('DOMContentLoaded', function() {
         document.querySelectorAll('form[action*="/cart/add/"]').forEach(form => {
@@ -103,5 +111,5 @@
                 button.disabled = true;
 
-                const fd = new FormData(form); // includes hidden CSRF field
+                const fd = new FormData(form);
                 fetch(form.action, {
                     method: 'POST',
Index: src/main/resources/templates/companies.html
===================================================================
--- src/main/resources/templates/companies.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/companies.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -113,5 +113,5 @@
 </head>
 <body>
-<th:block th:replace="fragments/header :: siteHeader('companies')"></th:block>
+<th:block th:replace="fragments/header :: siteHeader('Компании')"></th:block>
 
 <div class="page">
Index: src/main/resources/templates/create-health-profile.html
===================================================================
--- src/main/resources/templates/create-health-profile.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/create-health-profile.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html lang="mk" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>SynergyMed - Админ: Креирај здравствен профил</title>
-
-    <!-- Shared header styles -->
-    <th:block th:replace="fragments/header :: headerStyles"></th:block>
+    <title>SynergyMed - Здравствени профили</title>
+
+    <!-- Header styles -->
+    <th:block th:replace="~{fragments/header :: headerStyles}"></th:block>
 
     <style>
@@ -14,88 +14,57 @@
             font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
             background: linear-gradient(135deg, #a4ecba 0%, #f7f7f8 100%);
-            min-height: 100vh;
-        }
+            min-height:100vh;
+        }
+
         .site-header {
-            position: sticky; top:0; left:0; right:0;
-            width: 100%;
-            border-radius: 0;
-            z-index: 1000;
-        }
-        .container { max-width: 1200px; margin:0 auto; padding:20px; }
-        .header {
-            background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1);
-            margin-bottom:30px; overflow:hidden;
-        }
-        .header-content {
-            background: linear-gradient(135deg, #20b2aa, #48d1cc);
-            color:white; padding:30px; text-align:center;
-        }
+            position:sticky; top:0; left:0; right:0; width:100%;
+            border-radius:0; margin:0; z-index:1000; background:white !important;
+            box-shadow:0 2px 10px rgba(0,0,0,0.1);
+        }
+
+        .container { max-width:1200px; margin:0 auto; padding:20px; }
+
+        .header { background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); margin-bottom:30px; overflow:hidden; }
+        .header-content { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; padding:30px; text-align:center; }
         .header-content h1 { font-size:2.5rem; font-weight:300; margin-bottom:10px; }
         .header-content p { font-size:1.1rem; opacity:.9; }
-        .admin-badge {
-            background: rgba(255,255,255,0.2);
-            padding:8px 16px; border-radius:20px;
-            font-size:.9rem; display:inline-block; margin-top:10px;
-        }
-        .nav-bar {
-            background:white; border-radius:15px;
-            box-shadow:0 5px 15px rgba(0,0,0,.1);
-            margin-bottom:30px; padding:20px 30px;
-        }
-        .nav-links { display:flex; gap:20px; align-items:center; flex-wrap:wrap; }
-        .nav-link {
-            color:#20b2aa; text-decoration:none;
-            padding:10px 20px; border-radius:25px;
-            transition:all .3s ease; font-weight:500;
-        }
-        .nav-link:hover, .nav-link.active {
-            background: linear-gradient(135deg, #20b2aa, #48d1cc);
-            color:white;
-        }
-        .main-content { display:grid; gap:30px; }
-        .card {
-            background:white; border-radius:20px;
-            box-shadow:0 10px 30px rgba(0,0,0,.1);
-            overflow:hidden;
-        }
-        .card-header {
-            background: linear-gradient(135deg, #20b2aa, #48d1cc);
-            color:white; padding:25px 30px; font-size:1.3rem; font-weight:600;
-        }
+
+        .nav-bar { background:white; border-radius:15px; box-shadow:0 5px 15px rgba(0,0,0,.1); margin-bottom:30px; padding:20px 30px; }
+        .nav-links {
+            display:flex;
+            gap:20px;
+            align-items:center;
+            flex-wrap:nowrap;
+            overflow-x:auto;
+        }
+        .nav-link { color:#20b2aa; text-decoration:none; padding:10px 20px; border-radius:25px; transition:all .3s ease; font-weight:500; }
+        .nav-link:hover, .nav-link.active { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; }
+        .back-btn { margin-left:auto; background:linear-gradient(135deg,#6c757d,#495057); color:white; }
+
+        .card { background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; margin-bottom:30px; }
+        .card-header { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; padding:25px 30px; font-size:1.3rem; font-weight:600; }
         .card-body { padding:30px; }
-        .search-form { display:flex; gap:15px; margin-bottom:20px; }
+
+        .search-form { display:flex; gap:15px; margin-bottom:20px; flex-wrap:wrap; }
         .search-input {
-            flex:1; padding:15px 20px; border:2px solid #e9ecef; border-radius:15px;
-            font-size:1rem; transition:all .3s ease;
+            flex:1; padding:15px 20px; border:2px solid #e1e5e9; border-radius:12px;
+            font-size:1rem; transition:all .3s ease; background:#f8f9fa;
         }
         .search-input:focus {
-            outline:none; border-color:#20b2aa;
+            outline:none; border-color:#20b2aa; background:white;
             box-shadow:0 0 0 3px rgba(32,178,170,.1);
         }
-        .btn {
-            padding:15px 30px; border-radius:25px; font-weight:600; font-size:1rem;
-            text-decoration:none; border:none; cursor:pointer;
-            transition:all .3s ease; display:inline-block; text-align:center;
-        }
-        .btn-primary {
-            background: linear-gradient(135deg, #20b2aa, #48d1cc);
-            color:white;
-        }
-        .btn-primary:hover {
-            transform:translateY(-2px);
-            box-shadow:0 5px 15px rgba(32,178,170,.4);
-        }
-        .btn-secondary {
-            background:#6c757d; color:white;
-        }
-        .btn-secondary:hover {
-            background:#5a6268; transform:translateY(-2px);
-        }
-        .clients-grid {
-            display:grid; gap:15px; margin-bottom:30px;
-            max-height:400px; overflow-y:auto;
-        }
+        .btn-submit {
+            padding:15px 30px; background:linear-gradient(135deg,#20b2aa,#48d1cc);
+            color:white; border:none; border-radius:12px;
+            font-size:1rem; font-weight:600; cursor:pointer;
+            transition:all .3s ease; text-transform:uppercase; letter-spacing:1px;
+        }
+        .btn-submit:hover { transform:translateY(-2px); box-shadow:0 10px 20px rgba(32,178,170,.3); }
+        .btn-submit:active { transform:translateY(0); }
+
+        .clients-grid { display:grid; gap:15px; margin-bottom:30px; max-height:400px; overflow-y:auto; }
         .client-item {
-            background:#f8f9fa; border:2px solid #e9ecef;
+            background:#f8f9fa; border:2px solid #e1e5e9;
             border-radius:15px; padding:20px;
             transition:all .3s ease; cursor:pointer;
@@ -108,11 +77,13 @@
             color:white;
         }
+
         .blood-type-section { margin-top:30px; padding-top:30px; border-top:1px solid #e9ecef; display:none; }
         .blood-type-section.visible { display:block; animation:fadeIn .3s ease; }
         @keyframes fadeIn { from{opacity:0; transform:translateY(20px);} to{opacity:1; transform:translateY(0);} }
+
         .blood-type-grid { display:grid; grid-template-columns:repeat(auto-fit, minmax(80px,1fr)); gap:15px; margin-top:15px; }
         .blood-type-radio { display:none; }
         .blood-type-label {
-            display:block; background:#f8f9fa; border:2px solid #e9ecef;
+            display:block; background:#f8f9fa; border:2px solid #e1e5e9;
             border-radius:15px; padding:20px 15px; text-align:center;
             font-weight:bold; color:#666; cursor:pointer;
@@ -124,19 +95,28 @@
         }
         .blood-type-label:hover { border-color:#20b2aa; background:#f1fdfd; }
+
         .form-actions { display:flex; gap:15px; justify-content:center; margin-top:30px; }
-        .alert { padding:15px 20px; border-radius:15px; margin-bottom:20px; font-weight:500; }
-        .alert-success { background:#d1edff; color:#0c5460; border:1px solid #bee5eb; }
-        .alert-danger { background:#f8d7da; color:#721c24; border:1px solid #f5c6cb; }
-        .alert-info { background:#d1ecf1; color:#0c5460; border:1px solid #bee5eb; }
+        .alert { padding:15px; border-radius:12px; margin-bottom:20px; font-size:.9rem; }
+        .alert-danger { background-color:#fee; color:#c33; border:1px solid #fcc; }
+        .alert-success { background-color:#efe; color:#363; border:1px solid #cfc; }
+        .alert-info { background-color:#d1ecf1; color:#0c5460; border:1px solid #b6d4da; }
+
         .selected-client-info {
             background: linear-gradient(135deg, #e3f2fd, #f3e5f5);
             border-radius:15px; padding:20px; margin-bottom:25px; border-left:4px solid #20b2aa;
         }
+
+        @media (max-width:768px) {
+            .nav-links { flex-wrap:wrap; }
+            .search-form { flex-direction:column; }
+            .search-input { margin-bottom:15px; }
+            .header-content h1 { font-size:2rem; }
+        }
     </style>
 </head>
 <body>
 
-<!-- Full-width global header -->
-<th:block th:replace="fragments/header :: siteHeader(${null})"></th:block>
+<!-- Global header -->
+<th:block th:replace="~{fragments/header :: siteHeader(${null})}"></th:block>
 
 <div class="container">
@@ -144,7 +124,6 @@
     <div class="header">
         <div class="header-content">
-            <h1>Админ панел</h1>
-            <p>Креирај здравствени профили за клиенти</p>
-            <div class="admin-badge">Администраторски пристап</div>
+            <h1>Здравствени профили</h1>
+            <p>Креирајте здравствени профили за клиенти без профил</p>
         </div>
     </div>
@@ -153,72 +132,73 @@
     <div class="nav-bar">
         <div class="nav-links">
-            <a href="/admin/dashboard" class="nav-link">Табла</a>
-            <a href="/pharmacist/health-profile/create" class="nav-link active">Креирај здравствен профил</a>
-            <a href="/profile" class="nav-link">Назад кон профил</a>
+            <a href="#" th:href="@{/pharmacist/health-profile/create}" class="nav-link active">Здравствени профили</a>
+            <a href="#" th:href="@{/pharmacist/verification}" class="nav-link">Верификација на профили</a>
+            <a href="#" th:href="@{/pharmacist/supply-orders}" class="nav-link">Нарачка на роба</a>
+            <a href="#" th:href="@{/pharmacist/medicine/interactions}" class="nav-link">Интеракции на лекови</a>
+            <a href="#" class="nav-link back-btn" th:href="@{/profile}">Назад кон профилот</a>
         </div>
     </div>
 
-    <!-- Flash Messages -->
+    <!-- Alerts -->
     <div th:if="${success}" class="alert alert-success"><span th:text="${success}">Успех</span></div>
     <div th:if="${error}" class="alert alert-danger"><span th:text="${error}">Грешка</span></div>
-
-    <!-- Main -->
-    <div class="main-content">
-        <div class="card">
-            <div class="card-header">Креирај здравствен профил за клиент</div>
-            <div class="card-body">
-                <!-- Search -->
-                <form class="search-form" th:action="@{/pharmacist/health-profile/create}" method="get">
-                    <input type="text" name="searchTerm" class="search-input"
-                           placeholder="Пребарај клиенти по име или презиме..."
-                           th:value="${searchTerm}">
-                    <button type="submit" class="btn btn-primary">Пребарај</button>
-                </form>
-
-                <!-- Clients -->
-                <div th:if="${!#lists.isEmpty(clients)}" class="clients-grid" id="clientsGrid">
-                    <div th:each="client : ${clients}"
-                         class="client-item"
-                         th:data-client-id="${client.id}"
-                         th:data-client-name="${client.users.firstName + ' ' + client.users.lastName}"
-                         onclick="selectClient(this)">
-                        <div>
-                            <h4 th:text="${client.users.firstName + ' ' + client.users.lastName}">John Doe</h4>
-                            <p th:text="${client.users.email}">john@email.com</p>
-                        </div>
-                        <div>ИД: <span th:text="${client.id}">1</span></div>
+    <div th:if="${info}" class="alert alert-info"><span th:text="${info}">Инфо</span></div>
+
+    <!-- Main card -->
+    <div class="card">
+        <div class="card-header">Креирај здравствен профил за клиент</div>
+        <div class="card-body">
+            <!-- Search -->
+            <form class="search-form" th:action="@{/pharmacist/health-profile/create}" method="get">
+                <input type="text" name="searchTerm" class="search-input"
+                       placeholder="Пребарај клиенти по име или презиме..."
+                       th:value="${searchTerm}">
+                <button type="submit" class="btn-submit">Пребарај</button>
+            </form>
+
+            <!-- Clients -->
+            <div th:if="${!#lists.isEmpty(clients)}" class="clients-grid" id="clientsGrid">
+                <div th:each="client : ${clients}"
+                     class="client-item"
+                     th:data-client-id="${client.id}"
+                     th:data-client-name="${client.users.firstName + ' ' + client.users.lastName}"
+                     onclick="selectClient(this)">
+                    <div>
+                        <h4 th:text="${client.users.firstName + ' ' + client.users.lastName}">John Doe</h4>
+                        <p th:text="${client.users.email}">john@email.com</p>
+                    </div>
+                    <div>ИД: <span th:text="${client.id}">1</span></div>
+                </div>
+            </div>
+
+            <!-- Empty -->
+            <div th:if="${#lists.isEmpty(clients)}" class="alert alert-info">Нема пронајдени клиенти.</div>
+
+            <!-- Form -->
+            <form th:action="@{/pharmacist/health-profile/create}" method="post" id="createProfileForm">
+                <input type="hidden" name="clientId" id="selectedClientId">
+                <div id="selectedClientInfo" class="selected-client-info" style="display:none;">
+                    <h4>Се креира профил за:</h4>
+                    <p id="selectedClientName"></p>
+                </div>
+                <div class="blood-type-section" id="bloodTypeSection">
+                    <h3>Избери крвна група</h3>
+                    <div class="blood-type-grid">
+                        <div><input type="radio" id="a+" name="bloodType" value="A+" class="blood-type-radio"><label for="a+" class="blood-type-label">A+</label></div>
+                        <div><input type="radio" id="a-" name="bloodType" value="A-" class="blood-type-radio"><label for="a-" class="blood-type-label">A-</label></div>
+                        <div><input type="radio" id="b+" name="bloodType" value="B+" class="blood-type-radio"><label for="b+" class="blood-type-label">B+</label></div>
+                        <div><input type="radio" id="b-" name="bloodType" value="B-" class="blood-type-radio"><label for="b-" class="blood-type-label">B-</label></div>
+                        <div><input type="radio" id="ab+" name="bloodType" value="AB+" class="blood-type-radio"><label for="ab+" class="blood-type-label">AB+</label></div>
+                        <div><input type="radio" id="ab-" name="bloodType" value="AB-" class="blood-type-radio"><label for="ab-" class="blood-type-label">AB-</label></div>
+                        <div><input type="radio" id="o+" name="bloodType" value="O+" class="blood-type-radio"><label for="o+" class="blood-type-label">O+</label></div>
+                        <div><input type="radio" id="o-" name="bloodType" value="O-" class="blood-type-radio"><label for="o-" class="blood-type-label">O-</label></div>
+                    </div>
+                    <div class="form-actions">
+                        <button type="submit" class="btn-submit">Креирај</button>
+                        <button type="button" class="btn-submit back-btn" onclick="clearSelection()">Исчисти</button>
                     </div>
                 </div>
-
-                <!-- Empty -->
-                <div th:if="${#lists.isEmpty(clients)}" class="alert alert-info">Нема пронајдени клиенти.</div>
-
-                <!-- Form -->
-                <form th:action="@{/pharmacist/health-profile/create}" method="post" id="createProfileForm">
-                    <input type="hidden" name="clientId" id="selectedClientId">
-                    <div id="selectedClientInfo" class="selected-client-info" style="display:none;">
-                        <h4>Се креира профил за:</h4>
-                        <p id="selectedClientName"></p>
-                    </div>
-                    <div class="blood-type-section" id="bloodTypeSection">
-                        <h3>Избери крвна група</h3>
-                        <div class="blood-type-grid">
-                            <div><input type="radio" id="a+" name="bloodType" value="A+" class="blood-type-radio"><label for="a+" class="blood-type-label">A+</label></div>
-                            <div><input type="radio" id="a-" name="bloodType" value="A-" class="blood-type-radio"><label for="a-" class="blood-type-label">A-</label></div>
-                            <div><input type="radio" id="b+" name="bloodType" value="B+" class="blood-type-radio"><label for="b+" class="blood-type-label">B+</label></div>
-                            <div><input type="radio" id="b-" name="bloodType" value="B-" class="blood-type-radio"><label for="b-" class="blood-type-label">B-</label></div>
-                            <div><input type="radio" id="ab+" name="bloodType" value="AB+" class="blood-type-radio"><label for="ab+" class="blood-type-label">AB+</label></div>
-                            <div><input type="radio" id="ab-" name="bloodType" value="AB-" class="blood-type-radio"><label for="ab-" class="blood-type-label">AB-</label></div>
-                            <div><input type="radio" id="o+" name="bloodType" value="O+" class="blood-type-radio"><label for="o+" class="blood-type-label">O+</label></div>
-                            <div><input type="radio" id="o-" name="bloodType" value="O-" class="blood-type-radio"><label for="o-" class="blood-type-label">O-</label></div>
-                        </div>
-                        <div class="form-actions">
-                            <button type="submit" class="btn btn-primary">Креирај</button>
-                            <button type="button" class="btn btn-secondary" onclick="clearSelection()">Исчисти</button>
-                        </div>
-                    </div>
-                </form>
-
-            </div>
+            </form>
+
         </div>
     </div>
Index: src/main/resources/templates/facilities.html
===================================================================
--- src/main/resources/templates/facilities.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/facilities.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -116,5 +116,5 @@
 
 <!-- Global header -->
-<th:block th:replace="fragments/header :: siteHeader(${null})"></th:block>
+<th:block th:replace="fragments/header :: siteHeader('Објекти на аптеката')"></th:block>
 
 <div class="page">
@@ -122,5 +122,5 @@
         <div class="card-header">
             <span th:text="${'Објекти — ' + company.companyName}">Објекти</span>
-            <a class="btn btn-primary"
+            <a class="btn btn-primary" sec:authorize="hasRole('ADMIN')"
                th:href="@{/admin/companies/{cid}/facilities/new(cid=${company.id})}">
                 Додади нов
@@ -140,5 +140,5 @@
                         <div class="row">
                             <!-- Left: Edit -->
-                            <a class="btn-outline left"
+                            <a class="btn-outline left" sec:authorize="hasRole('ADMIN')"
                                th:href="@{/admin/companies/{cid}/facilities/{id}/edit(cid=${company.id}, id=${f.id})}">
                                 Уреди
@@ -146,5 +146,5 @@
 
                             <!-- Middle: Contact (centered) -->
-                            <a class="btn-outline middle"
+                            <a class="btn-outline middle" sec:authorize="hasRole('ADMIN')"
                                th:href="@{/admin/companies/{cid}/facilities/{id}/contacts(cid=${company.id}, id=${f.id})}">
                                 Контакт
@@ -152,5 +152,5 @@
 
                             <!-- Right: Delete -->
-                            <form class="right"
+                            <form class="right" sec:authorize="hasRole('ADMIN')"
                                   th:action="@{/admin/companies/{cid}/facilities/{id}/delete(cid=${company.id}, id=${f.id})}"
                                   method="post" style="display:inline">
Index: src/main/resources/templates/fragments/header.html
===================================================================
--- src/main/resources/templates/fragments/header.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/fragments/header.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -137,8 +137,8 @@
             <a class="nav-btn" sec:authorize="hasAnyRole('PHARMACIST','ADMIN')" th:href="@{/admin/branded-medicines}"
                th:classappend="${activePage}=='Брендирани лекови' ? ' active'">Брендирани лекови</a>
-            <a class="nav-btn" sec:authorize="hasRole('PHARMACIST')" th:href="@{/pharmacist/verification}"
-               th:classappend="${activePage}=='Верификација' ? ' active'">Верификација</a>
-            <a class="nav-btn" sec:authorize="hasRole('PHARMACIST')" th:href="@{/pharmacist/supply-orders}"
-               th:classappend="${activePage}=='Нарачка на роба' ? ' active'">Нарачки на роба</a>
+            <a class="nav-btn" sec:authorize="hasAnyRole('PHARMACIST')" th:href="@{/admin/companies/3/facilities}"
+               th:classappend="${activePage}=='Објекти на аптеката' ? ' active'">Објекти на аптеката</a>
+
+
         </nav>
 
@@ -155,4 +155,5 @@
                 <div class="dropdown" id="userDropdown" role="menu" aria-labelledby="userButton">
                     <a class="dropdown-item" th:href="@{/profile}" role="menuitem">Подесувања за профилот</a>
+                    <a class="dropdown-item" sec:authorize="hasRole('PHARMACIST')" th:href="@{/pharmacist/health-profile/create}" role="menuitem">Контролна табла </a>
                     <a class="dropdown-item" sec:authorize="hasRole('CLIENT') "th:href="@{/orders}" role="menuitem">Мои нарачки</a>
                     <a class="dropdown-item" sec:authorize="hasRole('CLIENT')" th:href="@{/cart}" role="menuitem">Кошничка 🛒</a>
@@ -163,6 +164,10 @@
                 </div>
             </div>
-
-            <a class="login-btn" th:unless="${u}" th:href="@{/login}">Најави се</a>
+            <div>
+            <a class="login-btn" th:unless="${u}" th:href="@{/login}">Најави се  </a>
+            </div>
+            <div>
+            <a class="login-btn" th:unless="${u}" th:href="@{/register}">Регистрирај се</a>
+            </div>
         </div>
     </header>
Index: src/main/resources/templates/index.html
===================================================================
--- src/main/resources/templates/index.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/index.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -221,5 +221,5 @@
 <body>
 <!-- Header -->
-<th:block th:replace="fragments/header :: siteHeader('medicines')"></th:block>
+<th:block th:replace="fragments/header :: siteHeader('Брендирани лекови')"></th:block>
 <div class="after-site-header"></div>
 
Index: src/main/resources/templates/login.html
===================================================================
--- src/main/resources/templates/login.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/login.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -88,4 +88,7 @@
       <a href="#" th:href="@{/forgot-password}">Ја заборавивте лозинката?</a>
     </div>
+    <div class="forgot-password">
+      <a href="#" th:href="@{/register}">Немате профил? Регистрирајте се!</a>
+    </div>
   </div>
 
Index: src/main/resources/templates/medicine-interactions.html
===================================================================
--- src/main/resources/templates/medicine-interactions.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/medicine-interactions.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -17,12 +17,19 @@
         }
 
+        /* Page-level override to keep the global header flat and sticky at the top */
         .site-header {
-            position:sticky; top:0; left:0; right:0; width:100%;
-            border-radius:0; margin:0; z-index:1000; background:white !important;
-            box-shadow:0 2px 10px rgba(0,0,0,0.1);
-        }
-
-        .container { max-width:1000px; margin:0 auto; padding:20px; }
-
+            position: sticky;
+            top: 0; left: 0; right: 0; width: 100%;
+            border-radius: 0;
+            margin: 0;
+            z-index: 1000;
+            background: white !important;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+        }
+
+        /* Layout */
+        .container { max-width:1200px; margin:0 auto; padding:20px; }
+
+        /* Page header card (not the global site-header) */
         .header { background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); margin-bottom:30px; overflow:hidden; }
         .header-content { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; padding:30px; text-align:center; }
@@ -30,14 +37,53 @@
         .header-content p { font-size:1.1rem; opacity:.9; }
 
+        /* Header action area */
+        .header-buttons {
+            display:flex;
+            gap:10px;
+            flex-wrap:wrap;
+            justify-content:center;
+            margin-top:14px;
+        }
+
+        /* Button styles (anchor-as-button) */
+        .btn {
+            display:inline-flex;
+            align-items:center;
+            gap:8px;
+            padding:12px 18px;
+            border-radius:12px;
+            border:2px solid #20b2aa;
+            background:#fff;
+            color:#20b2aa;
+            text-decoration:none;
+            font-weight:600;
+            cursor:pointer;
+            transition:transform .15s ease, box-shadow .15s ease, background .15s ease, color .15s ease, border-color .15s ease;
+        }
+        .btn:hover { box-shadow:0 6px 14px rgba(32,178,170,.18); transform:translateY(-1px); }
+        .btn:focus-visible { outline:3px solid rgba(32,178,170,.35); outline-offset:2px; }
+
+        .btn-primary {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc);
+            color:#fff;
+            border:none;
+            box-shadow:0 10px 20px rgba(32,178,170,.25);
+        }
+        .btn-primary:hover { box-shadow:0 14px 24px rgba(32,178,170,.30); }
+        .btn-primary:active { transform:translateY(0); }
+
+        /* Top nav under the page header card */
         .nav-bar { background:white; border-radius:15px; box-shadow:0 5px 15px rgba(0,0,0,.1); margin-bottom:30px; padding:20px 30px; }
-        .nav-links { display:flex; gap:20px; align-items:center; }
+        .nav-links { display:flex; gap:20px; align-items:center; flex-wrap:nowrap; overflow-x:auto; }
         .nav-link { color:#20b2aa; text-decoration:none; padding:10px 20px; border-radius:25px; transition:all .3s ease; font-weight:500; }
         .nav-link:hover, .nav-link.active { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; }
         .back-btn { margin-left:auto; background:linear-gradient(135deg,#6c757d,#495057); color:white; }
 
+        /* Cards */
         .card { background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; margin-bottom:30px; }
         .card-header { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; padding:25px 30px; font-size:1.3rem; font-weight:600; }
         .card-body { padding:30px; }
 
+        /* Form */
         .form-group { margin-bottom:25px; }
         .form-control { width:100%; padding:15px 20px; border:2px solid #e1e5e9; border-radius:12px; font-size:1rem; transition:all .3s ease; background:#f8f9fa; }
@@ -51,4 +97,5 @@
         .search-input { flex:1; }
 
+        /* Medicines grid */
         .medicine-grid { display:grid; grid-template-columns:repeat(auto-fill, minmax(280px, 1fr)); gap:20px; }
         .medicine-card { background:white; border-radius:15px; padding:20px; border:2px solid #e1e5e9; transition:all .3s ease; }
@@ -57,7 +104,22 @@
         .medicine-name { font-weight:600; color:#333; margin-bottom:8px; font-size:1.2rem; }
         .medicine-ingredient { color:#666; font-size:0.9rem; margin-bottom:15px; font-style:italic; }
-        .check-interactions-btn { width:100%; padding:12px; background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; border:none; border-radius:10px; font-weight:600; cursor:pointer; transition:all .3с ease; text-decoration:none; display:block; text-align:center; }
+
+        .check-interactions-btn {
+            width:100%;
+            padding:12px;
+            background:linear-gradient(135deg,#20b2aa,#48d1cc);
+            color:white;
+            border:none;
+            border-radius:10px;
+            font-weight:600;
+            cursor:pointer;
+            transition:all .3с ease;
+            text-decoration:none;
+            display:block;
+            text-align:center;
+        }
         .check-interactions-btn:hover { color:white; transform:translateY(-2px); box-shadow:0 8px 20px rgba(32,178,170,.3); }
 
+        /* Interaction list */
         .interaction-item { background:#f8f9fa; border-radius:15px; padding:20px; margin-bottom:15px; border-left:4px solid #20b2aa; position:relative; }
         .interaction-medicines { font-weight:600; color:#333; margin-bottom:8px; font-size:1.1rem; }
@@ -74,4 +136,5 @@
         .severity-low { border-left-color:#0c5460; }
 
+        /* Alerts */
         .alert { padding:15px; border-radius:12px; margin-bottom:20px; font-size:.9rem; }
         .alert-danger { background-color:#fee; color:#c33; border:1px solid #fcc; }
@@ -105,4 +168,7 @@
             <h1>Интеракции на лекови</h1>
             <p>Проверете можни интеракции меѓу лекови за безбедни комбинации на терапија</p>
+            <div class="header-buttons">
+                <a class="btn btn-primary" th:href="@{/pharmacist/medicine/interactions/add}">Креирај</a>
+            </div>
         </div>
     </div>
@@ -111,7 +177,9 @@
     <div class="nav-bar">
         <div class="nav-links">
-            <a href="#" class="nav-link">Лекови</a>
-            <a href="#" class="nav-link active">Интеракции</a>
-            <a href="#" class="nav-link back-btn" th:href="@{/}">Назад кон таблата</a>
+            <a href="#"   th:href="@{/pharmacist/health-profile/create}" class="nav-link">Здравствени профили</a>
+            <a href="#"  th:href="@{/pharmacist/verification}" class="nav-link">Верификација на профили</a>
+            <a href="#" th:href="@{/pharmacist/supply-orders}"  class="nav-link">Нарачка на роба</a>
+            <a href="#" th:href="@{/pharmacist/medicine/interactions}" class="nav-link active">Интеракции на лекови</a>
+            <a href="#" class="nav-link back-btn" th:href="@{/profile}">Назад кон профилот</a>
         </div>
     </div>
@@ -210,5 +278,5 @@
                     <div class="medicine-name" th:text="${m.medicineName}">Име на лек</div>
                     <div class="medicine-ingredient" th:text="${m.activeIngredient}">Активна состојка</div>
-                    <a th:href="@{'/medicine/interactions/' + ${m.id}}"
+                    <a th:href="@{'/pharmacist/medicine/interactions/' + ${m.id}}"
                        class="check-interactions-btn">Провери интеракции</a>
                 </div>
@@ -218,4 +286,7 @@
 
 </div>
+
+<!-- Optional: include header dropdown script from the fragment -->
+<th:block th:replace="~{fragments/header :: headerScripts}"></th:block>
 </body>
 </html>
Index: src/main/resources/templates/order-detail.html
===================================================================
--- src/main/resources/templates/order-detail.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/order-detail.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -32,9 +32,8 @@
 <div class="container">
     <div class="card">
-        <div class="card-header" th:text="${'Order #' + order.id}">Order #123</div>
+        <div class="card-header" th:text="${'Order ' + order.orderDate}">Order #123</div>
         <div class="card-body">
             <div class="success-icon">✔</div>
 
-            <p><strong>Date:</strong> <span th:text="${order.orderDate}">2025-08-30</span></p>
             <p><strong>Status:</strong> <span th:text="${order.status}">во тек</span></p>
             <p><strong>Total Paid:</strong> <span th:text="${order.totalPrice + ' ден.'}">0 ден.</span></p>
Index: src/main/resources/templates/orders.html
===================================================================
--- src/main/resources/templates/orders.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/orders.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -72,5 +72,4 @@
                         <div class="row">
                             <div class="muted" th:text="${'Expected: ' + o.expectedArrivalDate}">Expected</div>
-                            <div class="muted" th:text="${'#' + o.id}">#ID</div>
                         </div>
                     </div>
Index: src/main/resources/templates/register.html
===================================================================
--- src/main/resources/templates/register.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/register.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -234,5 +234,5 @@
     <div class="register-header">
         <h1>SynergyMed</h1>
-        <p>Создајте вашата нова сметка за да започнете.</p>
+        <p>Создајте нова сметка за да започнете.</p>
     </div>
 
Index: src/main/resources/templates/supplyorder-details.html
===================================================================
--- src/main/resources/templates/supplyorder-details.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/supplyorder-details.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,3 +1,2 @@
-<!-- templates/supplyorder-details.html -->
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="mk">
@@ -8,4 +7,17 @@
   <th:block th:replace="~{fragments/header :: headerStyles}"></th:block>
   <style>
+    /* Page-level override for the fragment header */
+    .site-header{
+      position: sticky;
+      top: 0;
+      left: 0;
+      right: 0;
+      width: 100%;
+      z-index: 1000;
+      border-radius: 0;
+      background: #ffffff;
+      box-shadow: 0 2px 10px rgba(0,0,0,.10);
+    }
+
     * { margin:0; padding:0; box-sizing:border-box; }
     body {
@@ -13,18 +25,32 @@
       background:linear-gradient(135deg,#a4ecba 0%, #f7f7f8 100%);
       min-height:100vh;
+      color:#1f2937;
     }
-    .site-header { position:sticky; top:0; left:0; right:0; width:100%; z-index:1000; }
+
+    /* Header & Nav-bar */
+    .header { background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); margin-bottom:30px; overflow:hidden; }
+    .header-content { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; padding:30px; text-align:center; }
+    .header-content h1 { font-size:2.5rem; font-weight:300; margin-bottom:10px; }
+    .header-content p { font-size:1.1rem; opacity:.9; }
+
+    .nav-bar { background:white; border-radius:15px; box-shadow:0 5px 15px rgba(0,0,0,.1); margin-bottom:30px; padding:20px 30px; }
+    .nav-links { display:flex; gap:20px; align-items:center; }
+    .nav-link { color:#20b2aa; text-decoration:none; padding:10px 20px; border-radius:25px; transition:all .3s ease; font-weight:500; }
+    .nav-link:hover, .nav-link.active { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; }
+    .back-btn { margin-left:auto; background:linear-gradient(135deg,#6c757d,#495057); color:white; }
+
     .container { max-width:1200px; margin:0 auto; padding:20px; }
-
-    .card { background:#fff; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; }
+    .card { background:#fff; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; margin-bottom:30px; }
     .card-header { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:#fff; padding:22px 28px; font-size:1.25rem; font-weight:600; }
     .card-body { padding:26px; }
+
     .muted { color:#6b7280; }
-
     table { width:100%; border-collapse:collapse; margin-top:12px; }
     th, td { padding:12px 10px; border-bottom:1px solid #eef2f7; text-align:left; }
 
-    .btn { padding:10px 16px; border-radius:12px; border:2px solid #20b2aa; background:#fff; color:#20b2aa; text-decoration:none; font-weight:600; }
     .actions { display:flex; gap:10px; margin-top:16px; }
+    .btn { padding:10px 16px; border-radius:12px; border:2px solid #20b2aa; background:#fff; color:#20b2aa; text-decoration:none; font-weight:600; cursor:pointer; transition:.2s; }
+    .btn:hover { box-shadow:0 6px 14px rgba(32,178,170,.18); }
+    .btn-primary { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:#fff; border:none; }
   </style>
 </head>
@@ -33,4 +59,24 @@
 
 <div class="container">
+  <!-- Header -->
+  <div class="header">
+    <div class="header-content">
+      <h1>Набавка #<span th:text="${order.id}">1</span></h1>
+      <p>Детали за нарачката</p>
+    </div>
+  </div>
+
+  <!-- Navigation -->
+  <div class="nav-bar">
+    <div class="nav-links">
+      <a th:href="@{/pharmacist/health-profile/create}" class="nav-link">Здравствени профили</a>
+      <a th:href="@{/pharmacist/verification}" class="nav-link">Верификација на профили</a>
+      <a th:href="@{/pharmacist/supply-orders}" class="nav-link active">Нарачка на роба</a>
+      <a th:href="@{/pharmacist/medicine/interactions}" class="nav-link">Интеракции на лекови</a>
+      <a th:href="@{/profile}" class="nav-link back-btn">Назад кон профилот</a>
+    </div>
+  </div>
+
+  <!-- Supply Order Details Card -->
   <div class="card">
     <div class="card-header">Набавка #<span th:text="${order.id}">1</span></div>
@@ -60,6 +106,5 @@
           <td>
             <span th:text="${ln.brandedMedicine.dosageForm}">табл.</span>
-            <span class="muted" th:if="${ln.brandedMedicine.strength != null}"
-                  th:text="' • ' + ${ln.brandedMedicine.strength}"> • 500mg</span>
+            <span class="muted" th:if="${ln.brandedMedicine.strength != null}" th:text="' • ' + ${ln.brandedMedicine.strength}"> • 500mg</span>
           </td>
           <td th:text="${ln.quantity}">1</td>
Index: src/main/resources/templates/supplyorder-list.html
===================================================================
--- src/main/resources/templates/supplyorder-list.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/supplyorder-list.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,3 +1,2 @@
-<!-- templates/supplyorder-list.html -->
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="mk">
@@ -6,6 +5,23 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>SynergyMed – Набавки</title>
+
+    <!-- Fragment styles -->
     <th:block th:replace="~{fragments/header :: headerStyles}"></th:block>
+
+    <!-- Page styles (override header after fragment import) -->
     <style>
+        /* Force the fragment header to be flat (no rounding) and stick to the very top */
+        .site-header{
+            position: sticky;
+            top: 0;
+            left: 0;
+            right: 0;
+            width: 100%;
+            z-index: 1000;            /* ensure it floats above content */
+            border-radius: 0;          /* remove rounding */
+            background: #ffffff;       /* solid white background */
+            box-shadow: 0 2px 10px rgba(0,0,0,.10);
+        }
+
         * { margin:0; padding:0; box-sizing:border-box; }
         body {
@@ -13,24 +29,59 @@
             background:linear-gradient(135deg,#a4ecba 0%, #f7f7f8 100%);
             min-height:100vh;
+            color:#1f2937;
         }
-        .site-header { position:sticky; top:0; left:0; right:0; width:100%; z-index:1000; }
+
+        /* Header & Nav-bar (page content, not the site-header fragment) */
+        .header { background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); margin-bottom:30px; overflow:hidden; }
+        .header-content { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; padding:30px; text-align:center; }
+        .header-content h1 { font-size:2.5rem; font-weight:300; margin-bottom:10px; }
+        .header-content p { font-size:1.1rem; opacity:.9; }
+
+        .nav-bar { background:white; border-radius:15px; box-shadow:0 5px 15px rgba(0,0,0,.1); margin-bottom:30px; padding:20px 30px; }
+        .nav-links { display:flex; gap:20px; align-items:center; }
+        .nav-link { color:#20b2aa; text-decoration:none; padding:10px 20px; border-radius:25px; transition:all .3s ease; font-weight:500; }
+        .nav-link:hover, .nav-link.active { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; }
+        .back-btn { margin-left:auto; background:linear-gradient(135deg,#6c757d,#495057); color:white; }
+
         .container { max-width:1200px; margin:0 auto; padding:20px; }
-
-        .card { background:#fff; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; }
+        .card { background:#fff; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; margin-bottom:30px; }
         .card-header { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:#fff; padding:22px 28px; font-size:1.25rem; font-weight:600; }
         .card-body { padding:26px; }
 
-        table { width:100%; border-collapse:collapse; margin-top:6px; }
+        .row-top { display:flex; justify-content:space-between; align-items:center; margin-bottom:6px; }
+        .btn { padding:8px 12px; border-radius:12px; border:2px solid #20b2aa; background:#fff; color:#20b2aa; text-decoration:none; font-weight:600; cursor:pointer; transition:.2s; }
+        .btn:hover { box-shadow:0 6px 14px rgba(32,178,170,.18); }
+        .muted { color:#6b7280; }
+        table { width:100%; border-collapse:collapse; margin-top:12px; }
         th, td { padding:12px 10px; border-bottom:1px solid #eef2f7; text-align:left; }
-        .muted { color:#6b7280; }
-        .row-top { display:flex; justify-content:space-between; align-items:center; margin-bottom:6px; }
-        .btn { padding:8px 12px; border-radius:12px; border:2px solid #20b2aa; background:#fff; color:#20b2aa; text-decoration:none; font-weight:600; }
+
         @media (max-width: 992px) { .row-top { flex-direction:column; gap:10px; align-items:flex-start; } }
     </style>
 </head>
 <body>
+<!-- Fragment header -->
 <th:block th:replace="~{fragments/header :: siteHeader(${null})}"></th:block>
 
 <div class="container">
+    <!-- Page header -->
+    <div class="header">
+        <div class="header-content">
+            <h1>Листа на набавки</h1>
+            <p>Преглед на сите креирани нарачки</p>
+        </div>
+    </div>
+
+    <!-- Navigation -->
+    <div class="nav-bar">
+        <div class="nav-links">
+            <a th:href="@{/pharmacist/health-profile/create}" class="nav-link">Здравствени профили</a>
+            <a th:href="@{/pharmacist/verification}" class="nav-link">Верификација на профили</a>
+            <a th:href="@{/pharmacist/supply-orders}" class="nav-link active">Нарачка на роба</a>
+            <a th:href="@{/pharmacist/medicine/interactions}" class="nav-link">Интеракции на лекови</a>
+            <a th:href="@{/profile}" class="nav-link back-btn">Назад кон профилот</a>
+        </div>
+    </div>
+
+    <!-- Supply Orders List Card -->
     <div class="card">
         <div class="card-header">Листа на набавки</div>
@@ -74,4 +125,5 @@
 </div>
 
+<!-- Fragment scripts -->
 <th:block th:replace="~{fragments/header :: headerScripts}"></th:block>
 </body>
Index: src/main/resources/templates/supplyorder.html
===================================================================
--- src/main/resources/templates/supplyorder.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/supplyorder.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,3 +1,2 @@
-<!-- templates/supplyorder.html -->
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="mk">
@@ -6,23 +5,52 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>SynergyMed – Креирај набавка</title>
+
+    <!-- Fragment styles -->
     <th:block th:replace="~{fragments/header :: headerStyles}"></th:block>
+
+    <!-- Page styles (override header after fragment import) -->
     <style>
+        /* Force the fragment header to be flat (no rounding) and stick to the very top */
+        .site-header{
+            position: sticky;
+            top: 0;
+            left: 0;
+            right: 0;
+            width: 100%;
+            z-index: 1000;            /* ensure it floats above content */
+            border-radius: 0;          /* remove rounding */
+            background: #ffffff;       /* solid white background */
+            box-shadow: 0 2px 10px rgba(0,0,0,.10);
+        }
+
         * { margin:0; padding:0; box-sizing:border-box; }
         body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-            background: linear-gradient(135deg, #a4ecba 0%, #f7f7f8 100%);
-            min-height: 100vh;
-        }
-        .site-header { position:sticky; top:0; left:0; right:0; width:100%; z-index:1000; }
+            font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background:linear-gradient(135deg,#a4ecba 0%, #f7f7f8 100%);
+            min-height:100vh;
+            color:#1f2937;
+        }
+
+        /* Header & Nav-bar (unified style) */
+        .page-header {
+            background: linear-gradient(135deg,#20b2aa,#48d1cc);
+            color: white;
+            padding: 25px 20px;
+            text-align: center;
+            border-radius: 0;      /* remove rounding */
+            margin: 0 0 20px 0;    /* spacing below only */
+            box-shadow: none;      /* no floating card effect */
+        }
+        .page-header h1 { font-size:2rem; margin-bottom:6px; font-weight:400; }
+        .page-header p { font-size:1rem; opacity:0.85; }
+        .nav-bar { background:white; border-radius:15px; box-shadow:0 5px 15px rgba(0,0,0,.1); margin-bottom:30px; padding:20px 30px; }
+        .nav-links { display:flex; gap:20px; align-items:center; }
+        .nav-link { color:#20b2aa; text-decoration:none; padding:10px 20px; border-radius:25px; transition:all .3s ease; font-weight:500; }
+        .nav-link:hover, .nav-link.active { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; }
+        .back-btn { margin-left:auto; background:linear-gradient(135deg,#6c757d,#495057); color:white; }
+
         .container { max-width:1200px; margin:0 auto; padding:20px; }
-
-        .card {
-            background:#fff; border-radius:20px;
-            box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden;
-        }
-        .card-header {
-            background:linear-gradient(135deg,#20b2aa,#48d1cc);
-            color:#fff; padding:22px 28px; font-size:1.25rem; font-weight:600;
-        }
+        .card { background:#fff; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1); overflow:hidden; margin-bottom:30px; }
+        .card-header { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:#fff; padding:22px 28px; font-size:1.25rem; font-weight:600; }
         .card-body { padding:26px; }
 
@@ -31,21 +59,12 @@
 
         label { font-weight:600; margin-bottom:6px; display:block; color:#374151; }
-        select, input[type="number"] {
-            width:100%; padding:12px 12px;
-            border:2px solid #e5e7eb; border-radius:12px; background:#fff; color:#111827;
-        }
+        select, input[type="number"] { width:100%; padding:12px 12px; border:2px solid #e5e7eb; border-radius:12px; background:#fff; color:#111827; }
 
         table { width:100%; border-collapse:collapse; margin-top:12px; }
         th, td { padding:12px 10px; border-bottom:1px solid #eef2f7; text-align:left; }
 
-        .btn {
-            padding:10px 16px; border-radius:12px;
-            border:2px solid #20b2aa; background:#fff; color:#20b2aa;
-            text-decoration:none; font-weight:600; cursor:pointer; transition:.2s;
-        }
+        .btn { padding:10px 16px; border-radius:12px; border:2px solid #20b2aa; background:#fff; color:#20b2aa; text-decoration:none; font-weight:600; cursor:pointer; transition:.2s; }
         .btn:hover { box-shadow:0 6px 14px rgba(32,178,170,.18); }
-        .btn-primary {
-            background:linear-gradient(135deg,#20b2aa,#48d1cc); color:#fff; border:none;
-        }
+        .btn-primary { background:linear-gradient(135deg,#20b2aa,#48d1cc); color:#fff; border:none;  padding:10px 16px; border-radius:12px; text-decoration:none; font-weight:600; cursor:pointer; transition:.2s;  }
         .btn-danger { border-color:#f0caca; color:#b3261e; }
         .muted { color:#6b7280; }
@@ -59,10 +78,29 @@
 
 <div class="container">
+    <!-- Header -->
+    <div class="page-header">
+        <div class="header-content">
+            <h1>Креирај набавка</h1>
+            <p>Пополнете форма за креирање нова нарачка</p>
+        </div>
+    </div>
+
+    <!-- Navigation -->
+    <div class="nav-bar">
+        <div class="nav-links">
+            <a th:href="@{/pharmacist/health-profile/create}" class="nav-link">Здравствени профили</a>
+            <a th:href="@{/pharmacist/verification}" class="nav-link">Верификација на профили</a>
+            <a th:href="@{/pharmacist/supply-orders}" class="nav-link active">Нарачка на роба</a>
+            <a th:href="@{/pharmacist/medicine/interactions}" class="nav-link">Интеракции на лекови</a>
+            <a th:href="@{/profile}" class="nav-link back-btn">Назад кон профилот</a>
+        </div>
+    </div>
+
+    <!-- Supply Order Form Card -->
     <div class="card">
         <div class="card-header">Креирај набавка</div>
         <div class="card-body">
-            <form th:action="@{/phramacist/supply-orders}" method="post" id="orderForm">
+            <form th:action="@{/pharmacist/supply-orders}" method="post" id="orderForm">
                 <input type="hidden" th:if="${_csrf != null}" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-
                 <div class="grid-2">
                     <div>
@@ -70,7 +108,5 @@
                         <select name="pharmacyId" id="pharmacySel" required>
                             <option value="" disabled selected>Избери аптека</option>
-                            <option th:each="p : ${pharmacies}"
-                                    th:value="${p.id}"
-                                    th:text="${p.company != null ? p.company.companyName : 'Аптека #' + p.id}"></option>
+                            <option th:each="p : ${pharmacies}" th:value="${p.id}" th:text="${p.company != null ? p.company.companyName : 'Аптека #' + p.id}"></option>
                         </select>
                     </div>
@@ -88,7 +124,5 @@
                         <select name="distributorId" id="distributorSel" required>
                             <option value="" disabled selected>Избери дистрибутер</option>
-                            <option th:each="d : ${distributors}"
-                                    th:value="${d.id}"
-                                    th:text="${d.company != null ? d.company.companyName : 'Дистрибутер #' + d.id}"></option>
+                            <option th:each="d : ${distributors}" th:value="${d.id}" th:text="${d.company != null ? d.company.companyName : 'Дистрибутер #' + d.id}"></option>
                         </select>
                     </div>
@@ -100,36 +134,34 @@
 
                 <div class="grid-1" style="margin-top:16px;">
-                    <div>
-                        <table id="itemsTable">
-                            <thead>
-                            <tr>
-                                <th style="width:60%;">Брендиран лек</th>
-                                <th style="width:20%;">Количина</th>
-                                <th style="width:20%;"></th>
-                            </tr>
-                            </thead>
-                            <tbody id="itemsBody">
-                            <tr>
-                                <td>
-                                    <select name="medicineIds" class="medicineSel" required>
-                                        <option value="" disabled selected>Прво избери дистрибутер</option>
-                                    </select>
-                                </td>
-                                <td>
-                                    <input type="number" name="quantities" min="1" step="1" value="1" required/>
-                                </td>
-                                <td>
-                                    <button type="button" class="btn btn-danger removeRow">Отстрани</button>
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
-                        <button type="button" class="btn" id="addRowBtn" style="margin-top:10px;">+ Додади ред</button>
-                    </div>
+                    <table id="itemsTable">
+                        <thead>
+                        <tr>
+                            <th style="width:60%;">Брендиран лек</th>
+                            <th style="width:20%;">Количина</th>
+                            <th style="width:20%;"></th>
+                        </tr>
+                        </thead>
+                        <tbody id="itemsBody">
+                        <tr>
+                            <td>
+                                <select name="medicineIds" class="medicineSel" required>
+                                    <option value="" disabled selected>Прво избери дистрибутер</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="number" name="quantities" min="1" step="1" value="1" required/>
+                            </td>
+                            <td>
+                                <button type="button" class="btn btn-danger removeRow">Отстрани</button>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <button type="button" class="btn" id="addRowBtn" style="margin-top:10px;">+ Додади ред</button>
                 </div>
 
                 <div class="actions">
                     <button type="submit" class="btn-primary">Креирај нарачка</button>
-                    <a class="btn" th:href="@{/}">Откажи</a>
+                    <a class="btn" th:href="@{/pharmacist/supply-orders}">Откажи</a>
                 </div>
             </form>
@@ -138,5 +170,4 @@
 </div>
 
-<!-- Hidden option banks (preloaded) -->
 <div id="optionBanks" style="display:none;">
     <div id="facilityBank">
Index: src/main/resources/templates/verification-approval.html
===================================================================
--- src/main/resources/templates/verification-approval.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/verification-approval.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,45 +1,103 @@
-<!-- templates/verification_approval.html -->
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html lang="mk" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
-    <title>Verification Review</title>
+    <title>Преглед на верификација</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <th:block th:replace="fragments/header :: headerStyles"></th:block>
     <style>
-        *{margin:0;padding:0;box-sizing:border-box}
-        body{font-family:'Segoe UI',Tahoma,Geneva,Verdana,sans-serif;min-height:100vh;background:linear-gradient(135deg,#a4ecba 0%,#fefeff 100%);color:#1f2937}
+        * { margin:0; padding:0; box-sizing:border-box; }
+        body {
+            font-family:'Segoe UI',Tahoma,Geneva,Verdana,sans-serif;
+            background:linear-gradient(135deg,#a4ecba 0%,#f7f7f8 100%);
+            min-height:100vh;
+        }
 
-        .site-header{
-            position: sticky;
-            top:0; left:0; right:0;
-            width:100%;
-            border-radius:0;
-            margin:0;
-            z-index:1000;
-            background:#fff !important;
-            box-shadow:0 2px 10px rgba(0,0,0,.1);
+        .site-header {
+            position:sticky; top:0; left:0; right:0;
+            width:100%; border-radius:0; margin:0;
+            z-index:1000; background:white !important;
+            box-shadow:0 2px 10px rgba(0,0,0,0.1);
         }
-        .after-site-header{ height:16px; }
 
-        .page{width:100%;max-width:900px;padding:28px;margin:0 auto}
-        .card{background:#fff;border-radius:18px;box-shadow:0 20px 40px rgba(0,0,0,.10);overflow:hidden;margin-bottom:28px}
-        .card-header{background:linear-gradient(135deg,#20b2aa,#48d1cc);color:#fff;padding:20px 24px;font-size:1.3rem;font-weight:600}
-        .card-body{padding:22px}
-        .row{display:flex;justify-content:space-between;align-items:center;padding:10px 0;border-bottom:1px solid #f0f0f0}
-        .label{font-weight:600;color:#374151;min-width:140px}
-        .val{flex:1}
-        .portrait{max-width:260px;border-radius:12px;border:1px solid #eef2f7;box-shadow:0 6px 18px rgba(0,0,0,.08)}
-        .actions{display:flex;gap:12px;margin-top:18px}
-        .btn{display:inline-block;padding:10px 16px;border-radius:10px;border:1px solid #e5e7eb;background:#fff;font-weight:600;cursor:pointer}
-        .btn-primary{background:linear-gradient(135deg,#20b2aa,#48d1cc);color:#fff;border:none}
-        .btn-danger{color:#b3261e;border-color:#f0caca}
+        .container { max-width:900px; margin:0 auto; padding:20px; }
+
+        .header {
+            background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1);
+            margin-bottom:30px; overflow:hidden;
+        }
+        .header-content {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc);
+            color:white; padding:30px; text-align:center;
+        }
+        .header-content h1 { font-size:2.3rem; font-weight:300; margin-bottom:10px; }
+        .header-content p { font-size:1rem; opacity:.9; }
+
+        .nav-bar {
+            background:white; border-radius:15px; box-shadow:0 5px 15px rgba(0,0,0,.1);
+            margin-bottom:30px; padding:20px 30px;
+        }
+        .nav-links {
+            display:flex; gap:20px; align-items:center; flex-wrap:nowrap; overflow-x:auto;
+        }
+        .nav-link {
+            color:#20b2aa; text-decoration:none; padding:10px 20px;
+            border-radius:25px; transition:all .3s ease; font-weight:500;
+        }
+        .nav-link:hover, .nav-link.active {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white;
+        }
+        .back-btn { margin-left:auto; background:linear-gradient(135deg,#6c757d,#495057); color:white; }
+
+        .card {
+            background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1);
+            overflow:hidden; margin-bottom:30px;
+        }
+        .card-header {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc);
+            color:white; padding:25px 30px; font-size:1.3rem; font-weight:600;
+        }
+        .card-body { padding:30px; }
+        .row { display:flex; justify-content:space-between; align-items:center; padding:10px 0; border-bottom:1px solid #f0f0f0; }
+        .label { font-weight:600; color:#374151; min-width:140px; }
+        .val { flex:1; }
+        .portrait { max-width:260px; border-radius:12px; border:1px solid #eef2f7; box-shadow:0 6px 18px rgba(0,0,0,.08); }
+        .actions { display:flex; gap:12px; margin-top:22px; }
+        .btn {
+            display:inline-block; padding:12px 20px; border-radius:12px;
+            border:1px solid #e5e7eb; background:#fff; font-weight:600; cursor:pointer;
+            transition:all .3s ease;
+        }
+        .btn-primary {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white; border:none;
+        }
+        .btn-danger { color:#b3261e; border-color:#f0caca; background:#fff; }
+        .btn:hover { transform:translateY(-2px); }
     </style>
 </head>
 <body>
-<th:block th:replace="fragments/header :: siteHeader('verification')"></th:block>
-<div class="after-site-header"></div>
+<th:block th:replace="fragments/header :: siteHeader(${null})"></th:block>
 
-<div class="page">
+<div class="container">
+    <!-- Header -->
+    <div class="header">
+        <div class="header-content">
+            <h1>Преглед на верификација</h1>
+            <p>Потврдете или одбијте верификација на клиент</p>
+        </div>
+    </div>
+
+    <!-- Navigation -->
+    <div class="nav-bar">
+        <div class="nav-links">
+            <a href="#" th:href="@{/pharmacist/health-profile/create}" class="nav-link">Здравствени профили</a>
+            <a href="#" th:href="@{/pharmacist/verification}" class="nav-link active">Верификација на профили</a>
+            <a href="#" th:href="@{/pharmacist/supply-orders}" class="nav-link">Нарачка на роба</a>
+            <a href="#" th:href="@{/pharmacist/medicine/interactions}" class="nav-link">Интеракции на лекови</a>
+            <a href="#" class="nav-link back-btn" th:href="@{/profile}">Назад кон профилот</a>
+        </div>
+    </div>
+
+    <!-- Content -->
     <div class="card">
         <div class="card-header" th:text="${item.client.users.firstName + ' ' + item.client.users.lastName}">Име на клиент</div>
@@ -50,5 +108,5 @@
             </div>
             <div class="row" style="align-items:flex-start;">
-                <div class="label">Portrait</div>
+                <div class="label">Фотографија</div>
                 <img class="portrait"
                      th:src="@{'/uploads/images/portraits/' + ${item.portraitPhoto}}"
@@ -61,5 +119,5 @@
                 </form>
                 <form th:action="@{/pharmacist/verification/{id}/deny(id=${item.id})}" method="post">
-                    <button type="submit" class="btn btn-danger">Одби</button>
+                    <button type="submit" class="btn btn-danger">Одбиј</button>
                 </form>
                 <a class="btn" th:href="@{/pharmacist/verification}">Назад</a>
Index: src/main/resources/templates/verification-list.html
===================================================================
--- src/main/resources/templates/verification-list.html	(revision bff4de4501a84df4baa63f77008ecf7f5550d1bb)
+++ src/main/resources/templates/verification-list.html	(revision b1e633f27f0dbd33ea404d60ead5ed45852935f2)
@@ -1,5 +1,4 @@
-<!-- templates/verification-list.html -->
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html lang="mk" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
@@ -8,36 +7,91 @@
     <th:block th:replace="fragments/header :: headerStyles"></th:block>
     <style>
-        *{margin:0;padding:0;box-sizing:border-box}
-        body{font-family:'Segoe UI',Tahoma,Geneva,Verdana,sans-serif;min-height:100vh;background:linear-gradient(135deg,#a4ecba 0%,#fefeff 100%);color:#1f2937}
+        * { margin:0; padding:0; box-sizing:border-box; }
+        body {
+            font-family:'Segoe UI',Tahoma,Geneva,Verdana,sans-serif;
+            background:linear-gradient(135deg,#a4ecba 0%,#f7f7f8 100%);
+            min-height:100vh;
+        }
 
-        /* Make the global site header stick to the very top, edge-to-edge */
-        .site-header{
-            position: sticky;
-            top:0; left:0; right:0;
-            width:100%;
-            border-radius:0;
-            margin:0;
-            z-index:1000;
-            background:#fff !important;
-            box-shadow:0 2px 10px rgba(0,0,0,.1);
+        .site-header {
+            position:sticky; top:0; left:0; right:0;
+            width:100%; border-radius:0; margin:0;
+            z-index:1000; background:white !important;
+            box-shadow:0 2px 10px rgba(0,0,0,0.1);
         }
-        .after-site-header{ height:16px; }
 
-        .page{width:100%;max-width:1200px;padding:28px;margin:0 auto}
-        .card{background:#fff;border-radius:18px;box-shadow:0 20px 40px rgba(0,0,0,.10);overflow:hidden;margin-bottom:28px}
-        .card-header{background:linear-gradient(135deg,#20b2aa,#48d1cc);color:#fff;padding:20px 24px;font-size:1.3rem;font-weight:600}
-        .card-body{padding:22px}
-        .grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(260px,1fr));gap:22px}
-        .tile{background:#fff;border-radius:16px;box-shadow:0 6px 18px rgba(0,0,0,.08);padding:18px;cursor:pointer;border:1px solid #eef2f7}
-        .tile:hover{transform:translateY(-2px);transition:.2s}
-        .name{font-weight:700}
-        .muted{color:#6c757d}
+        .container { max-width:1200px; margin:0 auto; padding:20px; }
+
+        .header {
+            background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1);
+            margin-bottom:30px; overflow:hidden;
+        }
+        .header-content {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc);
+            color:white; padding:30px; text-align:center;
+        }
+        .header-content h1 { font-size:2.5rem; font-weight:300; margin-bottom:10px; }
+        .header-content p { font-size:1.1rem; opacity:.9; }
+
+        .nav-bar {
+            background:white; border-radius:15px; box-shadow:0 5px 15px rgba(0,0,0,.1);
+            margin-bottom:30px; padding:20px 30px;
+        }
+        .nav-links {
+            display:flex; gap:20px; align-items:center; flex-wrap:nowrap; overflow-x:auto;
+        }
+        .nav-link {
+            color:#20b2aa; text-decoration:none; padding:10px 20px;
+            border-radius:25px; transition:all .3s ease; font-weight:500;
+        }
+        .nav-link:hover, .nav-link.active {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc); color:white;
+        }
+        .back-btn { margin-left:auto; background:linear-gradient(135deg,#6c757d,#495057); color:white; }
+
+        .card {
+            background:white; border-radius:20px; box-shadow:0 10px 30px rgba(0,0,0,.1);
+            overflow:hidden; margin-bottom:30px;
+        }
+        .card-header {
+            background:linear-gradient(135deg,#20b2aa,#48d1cc);
+            color:white; padding:25px 30px; font-size:1.3rem; font-weight:600;
+        }
+        .card-body { padding:30px; }
+        .grid { display:grid; grid-template-columns:repeat(auto-fill,minmax(260px,1fr)); gap:22px; }
+        .tile {
+            background:#f8f9fa; border-radius:16px; box-shadow:0 6px 18px rgba(0,0,0,.08);
+            padding:18px; cursor:pointer; border:2px solid #e1e5e9;
+            transition:all .3s ease;
+        }
+        .tile:hover { border-color:#20b2aa; background:#f1fdfd; transform:translateY(-2px); }
+        .name { font-weight:700; margin-bottom:8px; }
+        .muted { color:#6c757d; }
     </style>
 </head>
 <body>
-<th:block th:replace="fragments/header :: siteHeader('verification')"></th:block>
-<div class="after-site-header"></div>
+<th:block th:replace="fragments/header :: siteHeader(${null})"></th:block>
 
-<div class="page">
+<div class="container">
+    <!-- Header -->
+    <div class="header">
+        <div class="header-content">
+            <h1>Барања на чекање</h1>
+            <p>Проверете ги сите клиенти кои чекаат верификација</p>
+        </div>
+    </div>
+
+    <!-- Navigation -->
+    <div class="nav-bar">
+        <div class="nav-links">
+            <a href="#" th:href="@{/pharmacist/health-profile/create}" class="nav-link">Здравствени профили</a>
+            <a href="#" th:href="@{/pharmacist/verification}" class="nav-link active">Верификација на профили</a>
+            <a href="#" th:href="@{/pharmacist/supply-orders}" class="nav-link">Нарачка на роба</a>
+            <a href="#" th:href="@{/pharmacist/medicine/interactions}" class="nav-link">Интеракции на лекови</a>
+            <a href="#" class="nav-link back-btn" th:href="@{/profile}">Назад кон профилот</a>
+        </div>
+    </div>
+
+    <!-- Content -->
     <div class="card">
         <div class="card-header">Барања на чекање за верификација</div>