diff --git a/app/views/layouts/_footer.haml b/app/views/layouts/_footer.haml
index e6c8043..1fbd207 100644
--- a/app/views/layouts/_footer.haml
+++ b/app/views/layouts/_footer.haml
@@ -20,40 +20,40 @@
         .col-span-2.sm:col-span-1
           %p.font-medium.text-gray-900 Main
           %nav.mt-6{"aria-label" => "Footer Navigation - Services"}
-            %ul.space-y-4.text-sm
+            %ul.space-y-2.text-sm
               -[:retreats , :studios , :makerspace , :coworking].each do |main|
-                %li
+                %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                   %a.text-gray-700.transition.hover:opacity-75{:href => "/#{main}"}
                     =main.capitalize
         .col-span-2.sm:col-span-1
           %p.font-medium.text-gray-900 Hub Feenix
           %nav.mt-6{"aria-label" => "Footer Navigation - Hub Feenix"}
-            %ul.space-y-4.text-sm
-              %li
+            %ul.space-y-2.text-sm
+              %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                 %a.text-gray-700.transition.hover:opacity-75{:href => "/about"}
                   About
         .col-span-2.sm:col-span-1
           %p.font-medium.text-gray-900 Event Spaces
           %nav.mt-6{"aria-label" => "Footer Navigation - Hub Feenix"}
-            %ul.space-y-4.text-sm
-              %li
+            %ul.space-y-2.text-sm
+              %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                 %a.text-gray-700.transition.hover:opacity-75{:href => "/retreats"}
                   Retreats
-              %li
+              %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                 %a.text-gray-700.transition.hover:opacity-75{:href => "/coworking"}
                   Coworking
         .col-span-2.sm:col-span-1
           %p.font-medium.text-gray-900 News
           %nav.mt-6{"aria-label" => "Footer Navigation - Downloads"}
-            %ul.space-y-4.text-sm
+            %ul.space-y-2.text-sm
               - if blog = Merged::PagesHelper.last_blog
-                %li
+                %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                   %a.text-gray-700.transition.hover:opacity-75{:href => main_app.view_blog_path(blog.page.name) }
                     Latest News
-              %li
+              %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                 %a.text-gray-700.transition.hover:opacity-75{:href => "https://www.facebook.com/hubfeenix" , :target => "_blank"}
                   Facebook
-              %li
+              %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
                 %a.text-gray-700.transition.hover:opacity-75{:href => "https://www.instagram.com/hub_feenix/" , :target => "_blank"}
                   Instagram
         %ul.flex.justify-start.col-span-2.gap-6.lg:col-span-5.lg:justify-end
diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml
index 9beed92..3a5f9b7 100644
--- a/app/views/layouts/_header.haml
+++ b/app/views/layouts/_header.haml
@@ -3,10 +3,11 @@
     %a.inline-flex.items-center{"aria-label" => "Hub Feenix", :href => "/", :title => "Hub Feenix"}
       = image_tag("feenix_lintu.webp" , class: "h-20")
       %span.ml-2.text-xl.font-bold.tracking-wide.text-gray-800.uppercase Hub Feenix
-    %ul.flex.items-center.hidden.space-x-8.lg:flex
+    %ul.flex.items-center.hidden.gap-4.lg:flex
       - main_menu.each do |link , text|
-        %li
-          %a.font-medium.tracking-wide.text-gray-700.transition-colors.duration-400.hover:text-cyan-800{"aria-label" => "Our product", :href => link, :title => text}= text
+        %li.border-white.border-x.py-2.px-4.hover:bg-gray-50.hover:border-gray-700
+          %div{class: request.path == link ? 'border-b border-gray-700' :'' }
+            %a.font-medium.tracking-wide.text-gray-700.hover:text-black{"aria-label" => "Our product", :href => link, :title => text}= text
       %li
         = link_to "https://www.facebook.com/hubfeenix" , :target => "_blank" do
           = image_tag("fb.webp" , class: "h-10 rounded-md")