diff --git a/models/bitrix/src/index.ts b/models/bitrix/src/index.ts
index 303f94678a..441baf4a5f 100644
--- a/models/bitrix/src/index.ts
+++ b/models/bitrix/src/index.ts
@@ -14,7 +14,19 @@
 // limitations under the License.
 //
 
-import { ArrOf, Builder, Collection, Mixin, Model, Prop, ReadOnly, TypeRef, TypeString, UX } from '@hcengineering/model'
+import {
+  ArrOf,
+  Builder,
+  Collection,
+  Hidden,
+  Mixin,
+  Model,
+  Prop,
+  ReadOnly,
+  TypeRef,
+  TypeString,
+  UX
+} from '@hcengineering/model'
 import core, { TAttachedDoc, TDoc } from '@hcengineering/model-core'
 import bitrix from './plugin'
 
@@ -36,8 +48,10 @@ const DOMAIN_BITRIX = 'bitrix' as Domain
 @UX(getEmbeddedLabel('Bitrix'))
 export class TBitrixSyncDoc extends TDoc implements BitrixSyncDoc {
   type!: string
+
   @Prop(TypeString(), getEmbeddedLabel('BitrixId'))
   @ReadOnly()
+  @Hidden()
     bitrixId!: string
 }
 
diff --git a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
index 2039a516d5..fb0fef5d0e 100644
--- a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
@@ -197,15 +197,18 @@
   {/if}
 
   {#each mixins as mixin}
-    <div class="divider" />
-    {#each getMixinKeys(mixin._id) as key (typeof key === 'string' ? key : key.key)}
-      <AttributeBarEditor
-        {key}
-        _class={mixin._id}
-        object={hierarchy.as(issue, mixin._id)}
-        showHeader={true}
-        size={'medium'}
-      />
-    {/each}
+    {@const mixinKeys = getMixinKeys(mixin._id)}
+    {#if mixinKeys.length}
+      <div class="divider" />
+      {#each mixinKeys as key (typeof key === 'string' ? key : key.key)}
+        <AttributeBarEditor
+          {key}
+          _class={mixin._id}
+          object={hierarchy.as(issue, mixin._id)}
+          showHeader={true}
+          size={'medium'}
+        />
+      {/each}
+    {/if}
   {/each}
 </div>
diff --git a/plugins/view-resources/src/components/ClassAttributeBar.svelte b/plugins/view-resources/src/components/ClassAttributeBar.svelte
index 31e0560eb6..1521511a3c 100644
--- a/plugins/view-resources/src/components/ClassAttributeBar.svelte
+++ b/plugins/view-resources/src/components/ClassAttributeBar.svelte
@@ -53,47 +53,47 @@
   $: collapsed = getCollapsed(_class, nonEmpty)
 </script>
 
-<!-- svelte-ignore a11y-click-events-have-key-events -->
-{#if showHeader}
-  <div
-    class="attrbar-header"
-    class:collapsed
-    on:click={() => {
-      collapsed = !collapsed
-    }}
-  >
-    <div class="flex-row-center">
-      <span class="overflow-label">
-        <Label {label} />
-      </span>
-      <div class="icon-arrow">
-        <svg fill="var(--theme-dark-color)" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
-          <path d="M0,0L6,3L0,6Z" />
-        </svg>
+{#if keys.length}
+  <!-- svelte-ignore a11y-click-events-have-key-events -->
+  {#if showHeader}
+    <div
+      class="attrbar-header"
+      class:collapsed
+      on:click={() => {
+        collapsed = !collapsed
+      }}
+    >
+      <div class="flex-row-center">
+        <span class="overflow-label">
+          <Label {label} />
+        </span>
+        <div class="icon-arrow">
+          <svg fill="var(--theme-dark-color)" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
+            <path d="M0,0L6,3L0,6Z" />
+          </svg>
+        </div>
+      </div>
+      <div class="tool">
+        <Button
+          icon={setting.icon.Setting}
+          kind={'link'}
+          size={'medium'}
+          showTooltip={{ label: setting.string.ClassSetting }}
+          on:click={(ev) => {
+            ev.stopPropagation()
+            const loc = getCurrentResolvedLocation()
+            loc.path[2] = settingId
+            loc.path[3] = 'setting'
+            loc.path[4] = 'classes'
+            loc.path.length = 5
+            loc.query = { _class }
+            loc.fragment = undefined
+            navigate(loc)
+          }}
+        />
       </div>
     </div>
-    <div class="tool">
-      <Button
-        icon={setting.icon.Setting}
-        kind={'link'}
-        size={'medium'}
-        showTooltip={{ label: setting.string.ClassSetting }}
-        on:click={(ev) => {
-          ev.stopPropagation()
-          const loc = getCurrentResolvedLocation()
-          loc.path[2] = settingId
-          loc.path[3] = 'setting'
-          loc.path[4] = 'classes'
-          loc.path.length = 5
-          loc.query = { _class }
-          loc.fragment = undefined
-          navigate(loc)
-        }}
-      />
-    </div>
-  </div>
-{/if}
-{#if keys.length}
+  {/if}
   <div class="collapsed-container" class:collapsed>
     <AttributesBar {_class} {object} {keys} {readonly} {draft} on:update />
   </div>