diff --git a/COMET.Web.Common/Components/CardView/CardView.razor b/COMET.Web.Common/Components/CardView/CardView.razor
index 4ef7adc2..a4b5edae 100644
--- a/COMET.Web.Common/Components/CardView/CardView.razor
+++ b/COMET.Web.Common/Components/CardView/CardView.razor
@@ -39,7 +39,7 @@
         </tr>
     </table>
 </p>
-<div class="container" style="height:calc(100% - 40px); overflow:auto;max-width: inherit !important;">
+<div class="container" style="height:100%; overflow:auto;max-width: inherit !important;">
     <div class="row">
         <Virtualize ItemSize="@this.ItemSize" ItemsProvider="this.LoadItemsAsync" @ref="this.virtualize">
             <ItemContent>
diff --git a/COMETwebapp/Components/MultiModelEditor/ElementDefinitionTreeItem.razor b/COMETwebapp/Components/MultiModelEditor/ElementDefinitionTreeItem.razor
index 0da81199..3599d225 100644
--- a/COMETwebapp/Components/MultiModelEditor/ElementDefinitionTreeItem.razor
+++ b/COMETwebapp/Components/MultiModelEditor/ElementDefinitionTreeItem.razor
@@ -20,15 +20,17 @@
 //    along with this program. If not, see http://www.gnu.org/licenses/.
 ------------------------------------------------------------------------------->
 
-<div class="@this.CssClass" @attributes="this.AdditionalAttributes">
+<div class="@this.CssClass" style="display: flex; justify-content: space-between; align-items: center;" @attributes="this.AdditionalAttributes">
     @this.ElementBaseTreeRowViewModel.ElementName
-    <span>
-        <button class="starion-pill" title="Owning Domain Of Expertise: @this.ElementBaseTreeRowViewModel.OwnerShortName">@this.ElementBaseTreeRowViewModel.OwnerShortName</button>
-    </span>
-    @foreach (var categoryShortName in this.ElementBaseTreeRowViewModel.ElementBase.GetAllCategories().Select(x => x.ShortName))
-    {
+    <span style="text-align: end;">
         <span>
-            <button class="starion-pill" style="background-color:aliceblue !important;" title="Category: @categoryShortName">@categoryShortName</button>
+            <button class="starion-pill" title="Owning Domain Of Expertise: @this.ElementBaseTreeRowViewModel.OwnerShortName">@this.ElementBaseTreeRowViewModel.OwnerShortName</button>
         </span>
-    }
+        @foreach (var categoryShortName in this.ElementBaseTreeRowViewModel.ElementBase.GetAllCategories().Select(x => x.ShortName))
+        {
+            <span>
+                <button class="starion-pill" style="background-color:aliceblue !important;" title="Category: @categoryShortName">@categoryShortName</button>
+            </span>
+        }
+    </span>
 </div>