diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte
index f0982653b6..7652eca26a 100644
--- a/packages/panel/src/components/Panel.svelte
+++ b/packages/panel/src/components/Panel.svelte
@@ -47,19 +47,22 @@
 </script>
 
 <Panel
-  {title} {subtitle} {icon}
+  {title}
+  {subtitle}
+  {icon}
   rightSection={isFullSize}
   {showHeader}
-  bind:panelWidth bind:innerWidth
-  isProperties={innerWidth >= 900 || isProperties}
+  bind:panelWidth
+  bind:innerWidth
+  isProperties={innerWidth >= 500 || isProperties}
   isSubtitle={innerWidth < 900 || isSubtitle}
   on:close
 >
   <svelte:fragment slot="subtitle">
-    {#if $$slots['subtitle']}<slot name="subtitle" />{/if}
+    {#if $$slots.subtitle}<slot name="subtitle" />{/if}
   </svelte:fragment>
   <svelte:fragment slot="properties">
-    {#if $$slots['properties']}<slot name="properties" />{/if}
+    {#if $$slots.properties}<slot name="properties" />{/if}
   </svelte:fragment>
   <svelte:fragment slot="navigate-actions">
     <slot name="navigate-actions" />
@@ -81,12 +84,7 @@
   </svelte:fragment>
   <svelte:fragment slot="actions">
     {#if allowFullSize}
-      <Button
-        icon={IconExpand}
-        size={'medium'}
-        kind={'transparent'}
-        on:click={resizePanel}
-      />
+      <Button icon={IconExpand} size={'medium'} kind={'transparent'} on:click={resizePanel} />
     {/if}
   </svelte:fragment>
   {#if isFullSize}
diff --git a/packages/ui/src/components/Panel.svelte b/packages/ui/src/components/Panel.svelte
index a71aa3774f..3cbf48a6aa 100644
--- a/packages/ui/src/components/Panel.svelte
+++ b/packages/ui/src/components/Panel.svelte
@@ -34,8 +34,8 @@
   const dispatch = createEventDispatcher()
 </script>
 
-<div class="antiPanel antiComponent" bind:clientWidth={panelWidth}>  
-  <div class:panel-content={!rightSection} class:ad-section-50={rightSection} class:divide={rightSection}>    
+<div class="antiPanel antiComponent" bind:clientWidth={panelWidth}>
+  <div class='panel-content-container'>
     {#if showHeader}
       <div class="ac-header short mirror divide highlight">
         <div class="buttons-group">
@@ -45,7 +45,8 @@
             kind={'transparent'}
             on:click={() => {
               dispatch('close')
-            }} />
+            }}
+          />
           {#if $$slots['navigate-actions']}
             <div class="buttons-group xsmall-gap">
               <slot name="navigate-actions" />
@@ -63,11 +64,10 @@
             {#if subtitle}<span class="ac-header__description">{subtitle}</span>{/if}
           </div>
         </div>
-        {#if rightSection}
-          <div class="buttons-group xsmall-gap mr-4">
-            <slot name="commands" />
-          </div>
-        {/if}
+        <div class="buttons-group xsmall-gap mr-4">
+          <slot name="commands" />
+          <slot name="actions" />
+        </div>
       </div>
     {:else}
       <div class="ac-header short mirror divide highlight">
@@ -110,6 +110,9 @@
           <slot />
         </div>
       {/if}
+      {#if rightSection}
+        <slot name="rightSection" />
+      {/if}
       {#if $$slots.properties && isProperties}
         <div class="properties-container">
           <slot name="properties" />
@@ -117,25 +120,13 @@
       {/if}
     </div>
   </div>
-
-  {#if rightSection}
-    <slot name="rightSection" />
-  {/if}
-
-  <div class="ad-tools buttons-group xsmall-gap h-4" class:grow-reverse={reverseCommands}>
-    {#if !rightSection && $$slots.commands}
-      <slot name="commands" />
-    {/if}
-    <slot name="actions" />
-  </div>
 </div>
 
-<style lang="scss">
-  .panel-content {
+<style lang="scss"> 
+  .panel-content-container {
     display: flex;
     flex-grow: 1;
     flex-direction: column;
-    align-content: stretch;
   }
   .main-content {
     display: flex;
@@ -143,7 +134,8 @@
     flex-wrap: nowrap;
     min-width: 0;
     min-height: 0;
-    height: 100%;
+    flex-grow: 1;
+    // height: 100%;
 
     &.withProperties {
       flex-direction: row;
@@ -155,7 +147,7 @@
       flex-direction: column;
       flex-shrink: 0;
       min-width: 20rem;
-      width: 25%;
+      width: 20rem;
       // background-color: var(--board-card-bg-color);
 
       &::before {
diff --git a/plugins/activity-resources/src/components/Activity.svelte b/plugins/activity-resources/src/components/Activity.svelte
index 367a773557..4607b2a6f0 100644
--- a/plugins/activity-resources/src/components/Activity.svelte
+++ b/plugins/activity-resources/src/components/Activity.svelte
@@ -64,7 +64,7 @@
       </div>
     </div>
   {/if}
-  <div class="flex-col h-full min-h-0" class:background-accent-bg-color={!transparent}>
+  <div class="flex-col flex-grow min-h-0" class:background-accent-bg-color={!transparent}>
     <Scroller>
       <div class="p-10 select-text">
         {#if txes}
diff --git a/plugins/task-resources/src/components/state/DoneStateEditor.svelte b/plugins/task-resources/src/components/state/DoneStateEditor.svelte
index 19f6db1329..6db896f36c 100644
--- a/plugins/task-resources/src/components/state/DoneStateEditor.svelte
+++ b/plugins/task-resources/src/components/state/DoneStateEditor.svelte
@@ -43,7 +43,7 @@
 </script>
 
 <div
-  class="flex-row-center cursor-pointer"
+  class="flex-row-center cursor-pointer p-4"
   bind:this={container}
   on:click|preventDefault={() => {
     if (!opened) {
diff --git a/plugins/tracker-resources/src/components/issues/EditIssue.svelte b/plugins/tracker-resources/src/components/issues/EditIssue.svelte
index 5623836cb7..7cad634ac0 100644
--- a/plugins/tracker-resources/src/components/issues/EditIssue.svelte
+++ b/plugins/tracker-resources/src/components/issues/EditIssue.svelte
@@ -18,7 +18,17 @@
   import { createQuery, getClient, UserBox } from '@anticrm/presentation'
   import { StyledTextBox } from '@anticrm/text-editor'
   import type { Issue, IssueStatus, Team } from '@anticrm/tracker'
-  import { AnyComponent, Button, EditBox, IconDownOutline, IconUpOutline, Label, Scroller, IconMoreH, IconEdit } from '@anticrm/ui'
+  import {
+    AnyComponent,
+    Button,
+    EditBox,
+    IconDownOutline,
+    IconUpOutline,
+    Label,
+    Scroller,
+    IconMoreH,
+    IconEdit
+  } from '@anticrm/ui'
   import { createEventDispatcher, onMount } from 'svelte'
   import tracker from '../../plugin'
   // import Card from '../Card.svelte'
@@ -38,7 +48,7 @@
   let issue: Issue | undefined
   let currentTeam: Team | undefined
   let issueStatuses: WithLookup<IssueStatus>[] | undefined
-  let fullSize: boolean = false
+  const fullSize: boolean = false
   let innerWidth: number
 
   $: _id &&
@@ -95,9 +105,7 @@
       dispatch('close')
     }}
   >
-    <svelte:fragment slot="custom-title">
-      Custom Title
-    </svelte:fragment>
+    <svelte:fragment slot="custom-title">Custom Title</svelte:fragment>
     <svelte:fragment slot="subtitle">
       <div class="flex-between flex-grow">
         {#if currentTeam}
@@ -227,22 +235,16 @@
 {/if}
 
 <style lang="scss">
-  // .main-panel {
-  //   flex-grow: 2;
-  //   flex-basis: 47.5rem;
+  .header {
+    max-width: 56.25rem;
+    width: calc(100% - 5rem);
+    justify-content: space-between;
+    padding: 0 1.25rem;
+  }
 
-    .header {
-      max-width: 56.25rem;
-      width: calc(100% - 5rem);
-      justify-content: space-between;
-      padding: 0 1.25rem;
-    }
-
-    .content {
-      max-width: 53.75rem;
-      width: calc(100% - 7.5rem);
-    }
-  // }
+  .content {
+    width: 100%;
+  }
 
   .right-panel {
     .header {