diff --git a/app/Http/Controllers/Services/ServicesShowController.php b/app/Http/Controllers/Services/ServicesShowController.php
index 1fd3beb..afa183b 100644
--- a/app/Http/Controllers/Services/ServicesShowController.php
+++ b/app/Http/Controllers/Services/ServicesShowController.php
@@ -20,6 +20,7 @@ public function __invoke(string $locale, Service $service): View
             'name' => $service->name,
             'teaser' => $service->teaser,
             'content' => Str::of($service->content)->markdown(),
+            'tags' => $service->tags,
         ]);
     }
 }
diff --git a/lang/de_CH/components.php b/lang/de_CH/components.php
index 5677919..1d13551 100644
--- a/lang/de_CH/components.php
+++ b/lang/de_CH/components.php
@@ -10,7 +10,7 @@
                 effizienter macht.',
             'buttons' => [
                 'discover_now' => 'Jetzt entdecken',
-                'more' => 'Mehr über DocuWare,',
+                'more' => 'Mehr über DocuWare',
             ],
         ],
     ],
diff --git a/resources/views/app/contact/index.blade.php b/resources/views/app/contact/index.blade.php
index c3a7939..da9503a 100644
--- a/resources/views/app/contact/index.blade.php
+++ b/resources/views/app/contact/index.blade.php
@@ -20,10 +20,9 @@ classAttributes="block"/>
             <p>Haupstrasse 91</p>
             <p>CH-4455 Zunzgen</p>
         </address>
-        <x-a-badge href="https://www.google.com/maps/place/Hauptstrasse+91,+4455+Zunzgen,+Schweiz"
-                   label="{{ __('Google Maps') }}" class-attributes="mt-1" target="_blank" rel="noopener noreferrer">
+        <x-a-badge href="https://www.google.com/maps/place/Hauptstrasse+91,+4455+Zunzgen,+Schweiz" label="{{ __('Google Maps') }}" class-attributes="mt-1" target="_blank" rel="noopener noreferrer">
             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                 stroke="currentColor" class="mr-1 size-3">
+                 stroke="currentColor" class="ml-1 size-3">
                 <path stroke-linecap="round" stroke-linejoin="round"
                       d="M13.5 6H5.25A2.25 2.25 0 0 0 3 8.25v10.5A2.25 2.25 0 0 0 5.25 21h10.5A2.25 2.25 0 0 0 18 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"/>
             </svg>
diff --git a/resources/views/app/legal/imprint/index.blade.php b/resources/views/app/legal/imprint/index.blade.php
index e865058..0aaa48e 100644
--- a/resources/views/app/legal/imprint/index.blade.php
+++ b/resources/views/app/legal/imprint/index.blade.php
@@ -14,7 +14,7 @@
         <x-a-badge href="https://zefix.ch/de/search/entity/list/firm/1598166" label="{{ __('Zefix') }}"
                    class-attributes="mt-1" target="_blank" rel="noopener noreferrer">
             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                 stroke="currentColor" class="mr-1 size-3">
+                 stroke="currentColor" class="ml-1 size-3">
                 <path stroke-linecap="round" stroke-linejoin="round"
                       d="M13.5 6H5.25A2.25 2.25 0 0 0 3 8.25v10.5A2.25 2.25 0 0 0 5.25 21h10.5A2.25 2.25 0 0 0 18 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"/>
             </svg>
diff --git a/resources/views/app/products/show.blade.php b/resources/views/app/products/show.blade.php
index 34bf521..0f2a941 100644
--- a/resources/views/app/products/show.blade.php
+++ b/resources/views/app/products/show.blade.php
@@ -11,5 +11,4 @@
         <x-docuware-showme/>
     @endif
 
-
 </x-app-layout>
\ No newline at end of file
diff --git a/resources/views/app/services/show.blade.php b/resources/views/app/services/show.blade.php
index ce207d0..0f2a941 100644
--- a/resources/views/app/services/show.blade.php
+++ b/resources/views/app/services/show.blade.php
@@ -7,4 +7,8 @@
         <x-content :content="$content"/>
     </x-section>
 
+    @if(in_array('DocuWare', $tags))
+        <x-docuware-showme/>
+    @endif
+
 </x-app-layout>
\ No newline at end of file
diff --git a/resources/views/components/a-badge.blade.php b/resources/views/components/a-badge.blade.php
index 264982b..84970e8 100644
--- a/resources/views/components/a-badge.blade.php
+++ b/resources/views/components/a-badge.blade.php
@@ -2,6 +2,6 @@
 
 <a target="{{ $target }}" href="{{ $href }}" title="{{ $title ?? $label }}"
    class="{{ $classAttributes }} inline-flex items-center rounded-md bg-gray-400/10  px-2 py-1 text-sm font-medium text-gray-400 hover:bg-gray-400/20 hover:text-black hover:font-semibold ring-1 ring-gray-400/20 ring-inset cursor-pointer">
-    {{ $slot }}
     {{ $label }}
+    {{ $slot }}
 </a>