diff --git a/src/views/partials/widgets/hubl-menu-fix-url-circle.pug b/src/views/partials/widgets/hubl-menu-fix-url-circle.pug
index 58dcbf6..2e0df58 100644
--- a/src/views/partials/widgets/hubl-menu-fix-url-circle.pug
+++ b/src/views/partials/widgets/hubl-menu-fix-url-circle.pug
@@ -1,24 +1,6 @@
 if componentSet.has('circles')
   solid-widget(name='hubl-menu-fix-url-circle')
-    template
-      solid-link.segment.full(data-src="${value}" next=getRoute('circles', true))
-        solid-display.segment.full.text-color-white.heading-active.bg-color-heading.hover.active(
-          data-src='${value}'
-          fields='segment(status, circle(name, jabberID), badge)'
-          class-segment="segment full padding-top-xxsmall padding-bottom-xxsmall padding-right-small padding-left-medium"
-
-          class-status='segment text-top sub-menu-icon'
-
-          class-circle='segment three-quarter sub-menu-name'
-
-          class-name='ellipsis-content'
-
-          class-badge='segment badge'
-
-          value-badge='${value}'
-          widget-status='hubl-menu-publicprivate'
-          widget-badge='hubl-counter'
-          widget-jabberID='hubl-menu-jabberid'
-          widget-name='solid-display-div'
-          order-asc="name"
-        )
\ No newline at end of file
+    template ${value != "" ? `
+      <solid-link class="segment full" data-src="${value}" next="${hubl.getRoute('projects', true)}">
+        <solid-display class="segment full text-color-white heading-active bg-color-heading hover active" data-src='${value}' fields='segment(status, circle(name, jabberID), badge)' class-segment="segment full padding-top-xxsmall padding-bottom-xxsmall padding-right-small padding-left-medium"  class-status='segment text-top sub-menu-icon'  class-circle='segment three-quarter sub-menu-name'  class-name='ellipsis-content'  class-badge='segment badge'  value-badge='${value}' widget-status='hubl-menu-publicprivate' widget-badge='hubl-counter' widget-jabberID='hubl-menu-jabberid' widget-name='solid-display-div' order-asc="name"></solid-display>
+      </solid-link>` : ""}
\ No newline at end of file
diff --git a/src/views/partials/widgets/hubl-menu-fix-url-contact.pug b/src/views/partials/widgets/hubl-menu-fix-url-contact.pug
index 8c1ca7f..77ecfa2 100644
--- a/src/views/partials/widgets/hubl-menu-fix-url-contact.pug
+++ b/src/views/partials/widgets/hubl-menu-fix-url-contact.pug
@@ -1,18 +1,6 @@
 if componentSet.has('chat')
   solid-widget(name='hubl-menu-fix-url-contact')
-    template
-      solid-link.segment.full(data-src="${value}" next=getRoute('chat', true))
-        solid-display.segment.full.text-color-white.heading-active.bg-color-heading.hover.active(
-          data-src='${value}'
-          fields='segment(message(name, chatProfile.jabberID), badge)'
-          
-          class-segment="segment full padding-top-xxsmall padding-bottom-xxsmall padding-right-small padding-left-medium"
-          class-message='segment three-quarter sub-menu-name'
-          class-badge='segment badge'
-
-          value-badge='${value}'
-          widget-badge='hubl-counter'
-          widget-chatProfile.jabberID='hubl-menu-jabberid'
-          widget-name='solid-display-div'
-          order-asc='username'
-        )
\ No newline at end of file
+    template ${value != "" ? `
+      <solid-link class="segment full" data-src="${value}" next="${hubl.getRoute('chat', true)}">
+        <solid-display class="segment full text-color-white heading-active bg-color-heading hover active" data-src='${value}' fields='segment(message(name, chatProfile.jabberID), badge)'  class-segment="segment full padding-top-xxsmall padding-bottom-xxsmall padding-right-small padding-left-medium" class-message='segment three-quarter sub-menu-name' class-badge='segment badge'  value-badge='${value}' widget-badge='hubl-counter' widget-chatProfile.jabberID='hubl-menu-jabberid' widget-name='solid-display-div' order-asc='username'></solid-display>
+      </solid-link>` : ""}
\ No newline at end of file
diff --git a/src/views/partials/widgets/hubl-menu-fix-url-project.pug b/src/views/partials/widgets/hubl-menu-fix-url-project.pug
index 2766fb4..6b4f1cf 100644
--- a/src/views/partials/widgets/hubl-menu-fix-url-project.pug
+++ b/src/views/partials/widgets/hubl-menu-fix-url-project.pug
@@ -1,25 +1,6 @@
 if componentSet.has('projects')
   solid-widget(name='hubl-menu-fix-url-project')
-    template
-      solid-link.segment.full(data-src="${value}" next=getRoute('projects', true))
-        solid-display.segment.full.text-color-white.heading-active.bg-color-heading.hover.active(
-          data-src='${value}'
-          fields='segment(status, project(customer.name, name, jabberID), badge)'
-          class-segment="segment full padding-top-xxsmall padding-bottom-xxsmall padding-right-small padding-left-medium"
-
-          class-status='segment text-top sub-menu-icon'
-
-          class-project='segment three-quarter sub-menu-name'
-
-          class-customer.name='ellipsis-content'
-          class-name='ellipsis-content'
-
-          class-badge='segment badge text-top'
-
-          value-badge='${value}'
-          widget-status='hubl-menu-publicprivate'
-          widget-jabberID='hubl-menu-jabberid'
-          widget-badge='hubl-counter'
-          widget-name='solid-display-div'
-          order-asc="customer.name"
-        )
\ No newline at end of file
+    template ${value != "" ? `
+      <solid-link class="segment full" data-src="${value}" next="${hubl.getRoute('projects', true)}">
+        <solid-display class="segment full text-color-white heading-active bg-color-heading hover active" data-src='${value}' fields='segment(status, project(customer.name, name, jabberID), badge)' class-segment="segment full padding-top-xxsmall padding-bottom-xxsmall padding-right-small padding-left-medium"  class-status='segment text-top sub-menu-icon'  class-project='segment three-quarter sub-menu-name'  class-customer.name='ellipsis-content' class-name='ellipsis-content'  class-badge='segment badge text-top'  value-badge='${value}' widget-status='hubl-menu-publicprivate' widget-jabberID='hubl-menu-jabberid' widget-badge='hubl-counter' widget-name='solid-display-div' order-asc="customer.name"></solid-display>
+      </solid-link>` : ""}
\ No newline at end of file