From 567584faf02113ce497d008e52ecb45f7a0a27fc Mon Sep 17 00:00:00 2001
From: Meik <meik.drechsler@consulting4it.de>
Date: Thu, 13 Nov 2025 17:35:09 +0100
Subject: [PATCH] aktueller stand

---
 2025-11-13 17_31_36-.png                      |  Bin 0 -> 1723 bytes
 2025-11-13 17_31_55-.png                      |  Bin 0 -> 1837 bytes
 .../F4SD.Cockpit.Client.Test.csproj           |    6 +-
 .../Basics/Helper/HealthCardDataHelper.cs     | 2266 +++++++++--------
 .../Basics/Models/ConnectionStatusHelper.cs   |    9 +-
 .../Basics/Models/DataHistoryValueModel.cs    |    3 +
 .../QuickActionProtocollEntry.cs              |    3 +-
 .../Basics/SupportCaseDataProvider.cs         |    6 +-
 .../Basics/UiActions/ShowCustomDialog.cs      |    2 +-
 .../UiActions/ShowDetailedDataAction.cs       |    2 +-
 .../Basics/UserControls/ComboBoxPageable.xaml |    2 +-
 .../DataCanvas/DataCanvas.xaml.cs             |    8 +-
 .../HierarchicalSelectionControl.xaml         |    3 +-
 .../UserControls/SearchFilterBar.xaml.cs      |    1 -
 .../Ticket/CloseCaseDialogWithTicket.xaml     |    1 +
 .../Ticket/ForwardTicketDialog.xaml           |    6 +-
 FasdDesktopUi/Basics/cUtility.cs              |  438 ----
 .../Pages/DetailsPage/DetailsPageView.xaml.cs |    4 +-
 .../Pages/DetailsPage/DetailsPageViewModel.cs |    4 +-
 .../DetailsPage/Models/DetailsPageBase.cs     |    2 +-
 .../cDetailsPageDataHistoryDataModel.cs       |   19 +-
 .../DetailsPageDataHistoryCollection.xaml.cs  |   14 +-
 .../DetailsPageDataHistorySection.xaml.cs     |   23 +-
 .../DetailsPageDataHistoryTitleColumn.xaml.cs |   21 +-
 .../DetailsPageDataHistoryValueColumn.xaml.cs |    6 +-
 .../DetailsPageRefreshControl.xaml.cs         |    4 +-
 .../DetailsPageWindowStateBar.xaml            |   19 +-
 .../DetailsPageWindowStateBar.xaml.cs         |   77 +-
 .../Pages/SlimPage/SlimPageView.xaml.cs       |    4 +-
 .../SupportCasePageBase.cs                    |    8 +-
 .../ComboBoxResources.xaml                    |   52 +-
 .../CustomizableResources.xaml                |    2 +-
 32 files changed, 1253 insertions(+), 1762 deletions(-)
 create mode 100644 2025-11-13 17_31_36-.png
 create mode 100644 2025-11-13 17_31_55-.png

diff --git a/2025-11-13 17_31_36-.png b/2025-11-13 17_31_36-.png
new file mode 100644
index 0000000000000000000000000000000000000000..49803fe09fbabf8de77a3a82f2dd4683cec12768
GIT binary patch
literal 1723
zcmah~do<hG7Cxz|purtXQc=z1_Mv*IicyLTB3`}3`w@zgNT;DyjV6^Q;`WYaT2i^w
zHR@5XQmREnCdPQrcqFWrxk?Bvx6LeJk%hM7kxP1i`rrI@|2W?{d!N0}TIbu}KIcv-
z$=}!rZ3F-?4h$fM0|0A<)&v862ysObVrYUf!u<)LdGyc{WPEnfJJ=flap8fT<o%Fs
zcr}2`0KlYwZ@^?3PpFX7EXy}GD<XrI#Y(=G3jD97re0xulaZAeWdNn<;{u7^kv9@G
zuRTNJV-CvJd-9(;RIT1RVQ)SDc=gMF9J79jwe}g5-x~PVVrFHjATpKsG_v~Cm(_@+
zUvtG`;{~2q%fq?(A1W5t*Tn+ksjCi2wS{c%7+%eO7b9b;M5ja|JpfXD<p4bP`~RRY
zZ&fOlYgGDE{-|tfPTKo5N51-ptdljI2|x;$MZG&*TZ20%w@?HQd;!*4e!x-VF`f%k
zpW{GZ09KNF(5kGm@}n8jO2Y7Cz!RQ{U8(D6H;gA-EZr?7nt;Q6EB^C+X8wL^O)Pf2
z_}=B`Z>i$eG}ZO2*HzXfzUO2c=Q)j8>4oqnJ@BLmiaji|Fvd71q*2`376-7BG;UTn
ztaVwiFo>1N96N15RfnHRNs4(=JW<Yh_%{0tl3#EY)~8~qgk<W@Z1$NmBzbzXLh|$O
zBV^LW&9yP#!rk_TS;xIRZ7Y9pFg9Swu%!O_t~Rsls7VRllQ();riOvZNf)Z`of<gk
zyZjd%@M?hW=hYDG0oC)>F@iog;rwTiR%6|JyAbel(l>2!$t;%3%E}4=SJiYfB~HU!
zJY=0G$<L?W57)mPlz-_>H_d59quDz$nJ$f+Lp%Fx&boR8wb?3Ms83V6|1E!f#Q=DP
zp~=5JADoP8jW}+J(+pUgo^(t)?LId@Z^|cIhmc6WE-l#t!1B8sMwvisMkXpa{36Zh
zZOwBwp>Aw|**d&^r7_VI4u=ny?E|3}Qh(!dzjGN*6%~~%>BzF7GP%tv0v6R@v*LOk
zQpjB<hx2fCq?CMr!@ayYIvbBoyEy9>oMNL7+B4{3&n8D)VlzcSA@UyuFKZ`m0T2||
z`FfN^`{esj^yusKzuW7BzS@RBdc>>0-A9!4oc%ry0dfN)?)#ZoCW+y|<LD8-ozwt;
z%{<{B;*Jh9jYj*P0&@8^zX@$W3#qH?3CR0pXy>eFh<9MQOHPGydV2Ba(Z()rnH91j
zlR(=H7Qn#Wup4sDcPU0A84N~(gN|*tF)cfq81mjZ1}0{RGg;B!BEZO-IRec=yPn_s
z*E+B5v|xI-D@PnDw5!sg@o;gPDjO|Pr@{oHpBOq1P!+q0#N`nwnQ}X`hT_KxN$wV-
zVo3F5OSoM%Q@pU1trg)bw{jY!=?HMTIA`C=@sGd1Q7EF{by*z7b+=gE{AKfB0o_~i
zc0?I7k+DOuM4Iv(R4P>=zO3Fczj&Z<ch}Go6wtU_{Ek+8J@)*0L|Iu`0_7uDYf<#z
zLBE42F;6O$Hao5+GO2DN6xZ66y*_mwBbi_`1)l0loL9n233q&GYP<jv%)xRdmDj_=
z<Zw3Zx^Cz^?CkCHDwBE;o<Sk}`IzY2y8rf=o0fD>*T=r{XiCNgHr2P(5~x?qaW5q5
zw6WkRZA&&p&`|w6IzBemU>?s!FU)lr&d$ybFQ;s_9(n&3#p50FhY0mvSK0Oxkn=v2
zQk7cC&1!tFJIij1rXxUT0UU)pkhlI`T7faQT9(0ww}eVc{8+O<y~Hk4iBP>o_f!m!
z`_=-DgJkvT%{g;TzGaC5eLjwgvG%q8QmE)Dzhe}QQ_Izp^kXPJaAACgEQfj_=2=&T
zP&%X8xvA^dslS5q>yVci(y4Ujo@B}DwbPYVT5Al(2Bi-!n0+{v?36a1Q~z@Eq{xPP
z5rwL5>nxK69cXdV13{%Tl+Ry!x^dV!bDy>!C6J-c`e&W#^pBx7&#>-aK^;aSk=`j5
zn}|}I`N*Z3W>}|V;O(GNB|(r5vwyT728t~%S4~v<wKa6KcbsF6d@wFKM0I!iBJ99P
zdYg|P_)qgvr=`(@?(!$)(=Fc(_X&rU>alHp`o@0Y#0wZ`w|Dky3S;PVk0Y%hF1)rm
zyDxrvv&z#2--|NF>g5`R%X=zyOJM^ALYUWnTdMXZ!tn?dgnA=!yHR)=RH&13eh@F}
lp5<QfU7xyM`p}Boj;ZU|2^t;K`2hM`K%g&)*i5)^>wnxT6K4Pb

literal 0
HcmV?d00001

diff --git a/2025-11-13 17_31_55-.png b/2025-11-13 17_31_55-.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ec66990a3b18834b44b9798560de7bdcd812f29
GIT binary patch
literal 1837
zcmah~dpz4&7Qd-_)Uz3+N{#VoRfm!x+EP_2Q)wf*>RnZSS|SNbqKIcZ*koIesrBrL
zQKU?SMyuAVqq`x+E>&zo#i!M(iFiNj75me__p|%Qz4x4ZzUOm3=iGC@hk1o?QB7G_
z833S$b9M0m0KtQ0HzfslKfdlC1|JBj$3<sQ*LOq$EBnKo+?)X5<)~~2%ftGC+pd08
z0M!4nw-AD;>YMQ8H#Dp-?P^pgEiO3b7PuI5>sBO{7)1;8Qi5F+Dse7Op7DXRVn>Q*
zn2sPibgiJzYgnCu@cQipl3#X7zDC@#6jna%qG;#b`T8C|eZPgh_T}N{8C4{cYOPp=
znX{7r0p{uGBLdtJ0WZX^ZFRnfN>5J7IsM)`L0Vsx^K`yF(K=;yEF<2hV&FCad<Fvn
z9yfA!wwvWZkU&ZcAX5h;p1+H1A2ESITD)1Piz+y1VWa>UD5M;4xxWX;@&Onyg3UxE
z8k~R5&;j51{}-6{1JNrclfQl{a)qllA+(QsD76f1(+N-nK{}g8p@@frPu$mQCwb(R
z`rQpLV<ph>-KG&+(#<};W52u*+)rnelHr&^T6^H$M{IN7$GCs(nkNW1rx^OeGn=*T
z6t_f?9RLY*qtHbjvu6U5qH1UO`3|hCBKe*^Vd54A*~_wjy<Z9FL^&XP30__I9<Qei
zH3&0|*yPpmvbvcht{;D9bS4mhPdMXH-lB1S>B9zTCY<GXx(zfEgtMjG;aKVwQ5f5d
z4dKX!j0GpU@Y`F)q<l~I_e5D3?;unEYI*~5S(v473YWxZcp0w>(uxlLugZKaU{98)
z>ofbB-}Ttxs-r$93&k@t<^WuH(p8Ni5uS<FZOz=RAP$*aXLD)_g+h%vS2^=R5WanN
zt#$56_q$h(!Np}|?*7K4{-vHvHwu?luz1W+=451tv!g1oI;X{xQ#@yJ_U4a<kLJ}0
z`JJ6C+erzt=$Ms!t>=lOkHYs|d&>}VC;a2M14ID2UbEuHsdW8w+r?YS(}4@W2+Lno
zqe)qFvJEsx&FbeW<e;@xR&+^+R)aqmwS5<)Ee0b8In}uvL*KTxS0Cdx`6qu^f>Cl9
z&U?~&GLZ^8;unqC!sE`~^};;+d-(`9&jzBS3LZq^gFxD$2IL^wQ?r<LKVp?)o>jz3
zwYcN19-#nq+{+mf%wKZ7IK!U`9vg6LZJ?H{YDIE+762d3EFrqK{tp;j#8O56uqJvZ
z)0Jop2crA&ZS8lpbbr8vUqgNr{(%553$gfmdUE@l+=%a?ay8hO%wb5pYCKg`M)a7X
zRkCob>CnmjLI4(ZOdz^LqW2|d)ab`pEnQxBH!kirWK`8}N8p3^yM}ta&}Tan;?&<o
zKWpzHQ0R<HAC_`T?P5<{H-^ALM@L9mG$&3R>;HYbAn9DpCu*GZ-#M?OnN?328+kt7
zw$KQ3R<^SxDd~ImQHDtnAV5V3@>!asSvcNqa8y83`P2Lbq1t6b<kfVo!Z#&fVB1K^
zuHTku<@4aGEPA#oM0N(GO_)I`9kiJ*i<V>J*3@H$gIjIkl*q`)UmZhETU%?MJ(=Nx
zH&pHvd_k(ny9!Af_sboNH>7I`oH9jlJd;J;Kxnq7?*62a$8eyph-TldNB3hw>GaWL
z>fA4_NgEA`3-6u!NAm<Z;$e=DSQysdQd3jI!rTZ(>e0SY!Qutx9xn<FtmS*N55sI=
z|7W<7@bx=e8VdbLH^_0UO_FV3|Czu#{h=<PdE(_+YFBd1O7+&<=BmYRV3Z+J)6vfF
zCjulxr;aLf<-nb6)6|_(e2A%g%H-S*TK}xzNffS`CV6O|^ha*%ZCP95=1TZNTkYSC
z*j8pYW$4a}!OO;>c?G3;J2M7N3<*6^1L)kyz~aqscCk$zq4MRW?5(`gx^*F~j*9?Y
z7s_Gg_|<ifmADbu2lWsF%xJxnoj|?R(gaVhQlyvBQ&UsdZ$+d3h6JGEg($+K#&cSw
z&@xK|HI}$gIJ@x*;QYXlQEW}y(>I4s-q7Vu=4&@ysWBPm2&J#w5I{#>tnZme>h1m7
z_t&Bt$0(<QCS%St7ct@QM<V6uRvy5oo{x`6Znq40X#;sk2_Y?428+IBd$ni>%z5W_
ztAZ<kZES3;#LyMkYt>HE?y=!DroM&_NKNcNiPix8h@Bmn4<qW5BO=#U%qlG*F2S_;
z_2<B`oT1syHyZmuknhalqDVv1K0TA5w};S!L|d^3w_rSQs0#qqN4gbvaf_qVhkd;x
z`AH>xC9}3)*(H6{nsFC?!487U|E2Np3h^<R(-<_n?y|~JVq*Y2Gj{iBzHOIl`eg41
PPcwkS5?tz>gYNwY5xPYR

literal 0
HcmV?d00001

diff --git a/F4SD.Cockpit.Client.Test/F4SD.Cockpit.Client.Test.csproj b/F4SD.Cockpit.Client.Test/F4SD.Cockpit.Client.Test.csproj
index a193f65..6d7ec82 100644
--- a/F4SD.Cockpit.Client.Test/F4SD.Cockpit.Client.Test.csproj
+++ b/F4SD.Cockpit.Client.Test/F4SD.Cockpit.Client.Test.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <OutputType>Exe</OutputType>
     <RootNamespace>F4SD.Cockpit.Client.Test</RootNamespace>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <!--
     To enable the Microsoft Testing Platform 'dotnet test' experience, add property:
       <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
-    <PackageReference Include="xunit.v3" Version="3.1.0" />
+    <PackageReference Include="xunit.v3" Version="3.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/FasdDesktopUi/Basics/Helper/HealthCardDataHelper.cs b/FasdDesktopUi/Basics/Helper/HealthCardDataHelper.cs
index c924704..b5a6293 100644
--- a/FasdDesktopUi/Basics/Helper/HealthCardDataHelper.cs
+++ b/FasdDesktopUi/Basics/Helper/HealthCardDataHelper.cs
@@ -33,21 +33,22 @@ namespace FasdDesktopUi.Basics.Helper
 {
     public class cHealthCardDataHelper
     {
-        #region Properties and fields
+        #region sub helpers
 
-        private readonly cSupportCaseDataProvider dataProvider;
-        private bool isInEditMode;
+        public readonly cHealthCardSlimPageHelper SlimCard;
+        public readonly cHealthCardHistoryDataHelper HistoryData;
+        public readonly cHealthCardDetailPageHelper DetailPage;
+        public readonly cHealthCardDataLoadingHelper LoadingHelper;
+        public readonly cHealthCardCustomizableSectionHelper CustomizableSectionHelper;
+
+        #endregion sub helpers
+
+        #region public properties, fields & events
 
         public cHealthCard SelectedHealthCard { get; private set; }
 
         public cF4SDHealthCardRawData HealthCardRawData { get; private set; } = new cF4SDHealthCardRawData();
 
-        public Dictionary<enumFasdInformationClass, cHeadingDataModel> HeadingData { get; private set; }
-
-        public DateTime? LastDataRequest { get; set; } = null;
-
-        private readonly MenuItemDataProvider _menuDataProvider;
-
         public bool IsInEditMode
         {
             get => isInEditMode; set
@@ -57,25 +58,20 @@ namespace FasdDesktopUi.Basics.Helper
             }
         }
 
-        #endregion Properties and fields
-
-        #region Events
-
-        public event EventHandler DataChanged;
-
-        public event EventHandler DataFullyLoaded;
-
-        public event EventHandler DataRefreshed;
-
         public static event EventHandler<BooleanEventArgs> EditModeChanged;
 
-        #endregion // Events
+        #endregion public properties, fields & events
 
-        #region sub helpers
-        public readonly cHealthCardSlimPageHelper SlimCard;
-        public readonly cHealthCardHistoryDataHelper HistoryData;
-        public cHealthCardDetailPageHelper DetailPage;
-        #endregion // sub helpers
+        #region private properties, fields & events
+
+        private readonly cSupportCaseDataProvider dataProvider;
+        private bool isInEditMode;
+
+        private Dictionary<enumFasdInformationClass, cHeadingDataModel> HeadingData { get; set; }
+
+        private readonly MenuItemDataProvider _menuDataProvider;
+
+        #endregion private properties, fields & events
 
         public cHealthCardDataHelper(cSupportCaseDataProvider dataProvider)
         {
@@ -86,6 +82,8 @@ namespace FasdDesktopUi.Basics.Helper
             HistoryData = new cHealthCardHistoryDataHelper(this);
             SlimCard = new cHealthCardSlimPageHelper(this);
             DetailPage = new cHealthCardDetailPageHelper(this);
+            LoadingHelper = new cHealthCardDataLoadingHelper(this);
+            CustomizableSectionHelper = new cHealthCardCustomizableSectionHelper(this);
         }
 
         public void Reset()
@@ -140,48 +138,12 @@ namespace FasdDesktopUi.Basics.Helper
 
         #region GetHealthCardData
 
-        public static bool HasAvailableHealthCard(List<enumFasdInformationClass> informationClasses)
+        private static cHealthCard GetAvailableHealthCard(List<enumFasdInformationClass> informationClasses)
         {
             try
             {
                 if (informationClasses is null)
-                    return false;
-
-                var _hc = cF4SDCockpitXmlConfig.Instance?.HealthCardConfig?.HealthCards?.Values;
-                if (_hc != null)
-                {
-                    foreach (var healthCard in _hc)
-                    {
-                        bool found = true;
-
-                        foreach (var informationClass in informationClasses)
-                        {
-                            found &= healthCard.InformationClasses.Any(healthCardInformationClass => healthCardInformationClass == informationClass);
-                            if (!found)
-                                break;
-                        }
-
-                        found &= HasCockpitUserRequiredRoles(healthCard.RequiredRoles);
-
-                        if (found)
-                            return true;
-                    }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return false;
-        }
-
-        public bool TryGetHealthcard(List<enumFasdInformationClass> informationClasses)
-        {
-            try
-            {
-                if (informationClasses is null)
-                    return false;
+                    return null;
 
                 foreach (var healthCard in cF4SDCockpitXmlConfig.Instance?.HealthCardConfig?.HealthCards.Values)
                 {
@@ -197,10 +159,7 @@ namespace FasdDesktopUi.Basics.Helper
                     found &= HasCockpitUserRequiredRoles(healthCard.RequiredRoles);
 
                     if (found)
-                    {
-                        SelectedHealthCard = healthCard;
-                        return true;
-                    }
+                        return healthCard;
                 }
             }
             catch (Exception E)
@@ -211,408 +170,26 @@ namespace FasdDesktopUi.Basics.Helper
             {
             }
 
-            return false;
+            return null;
         }
 
-        private async Task<enumActualizeStatus> ActualizeDataAsync()
+        public static bool HasAvailableHealthCard(List<enumFasdInformationClass> informationClasses)
         {
-            var output = enumActualizeStatus.unknown;
-
-            try
-            {
-                const int refreshDelayInMilliseconds = 500;
-                const int maxPollCount = 20;
-
-                if (dataProvider.Identities.Any(identity => identity.Class == enumFasdInformationClass.Computer) is false)
-                {
-                    LogEntry("Coudldn't acutalize data. There was no information class of type computer found.", LogLevels.Error);
-                    return output;
-                }
-
-                if (dataProvider.NamedParameterEntries.TryGetValue("AgentDeviceId", out var agentDeviceIdParameter) is false || int.TryParse(agentDeviceIdParameter.GetValue(), out int agentDeviceId) is false)
-                {
-                    LogEntry("Coudldn't acutalize data. There was no valid AgentDeviceId found.", LogLevels.Error);
-                    return output;
-                }
-
-                int? agentUserId = null;
-                if (dataProvider.Identities.Any(identity => identity.Class == enumFasdInformationClass.User))
-                    if (dataProvider.NamedParameterEntries.TryGetValue("AgentUserId", out var agentUserIdParameter))
-                        if (int.TryParse(agentUserIdParameter.GetValue(), out int tempAgentUserId))
-                            agentUserId = tempAgentUserId;
-
-                var actualizeId = await cFasdCockpitCommunicationBase.Instance.ActualizeAgentData(agentDeviceId, agentUserId);
-
-                if (actualizeId == Guid.Empty)
-                    return enumActualizeStatus.failed;
-
-                enumFasdInformationClass informationClass = agentUserId != null ? enumFasdInformationClass.User : enumFasdInformationClass.Computer;
-                int pollCount = 0;
-
-                while (output == enumActualizeStatus.unknown)
-                {
-                    output = await cFasdCockpitCommunicationBase.Instance.GetActualizeAgentDataStatus(actualizeId, informationClass);
-
-                    if (output == enumActualizeStatus.unknown)
-                    {
-                        pollCount++;
-                        if (pollCount >= maxPollCount)
-                            return output;
-
-                        await Task.Delay(refreshDelayInMilliseconds);
-                    }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
+            return GetAvailableHealthCard(informationClasses) != null;
         }
 
-        private void UpdateLatestValues(cF4SDHealthCardRawData newRawData)
+        public bool TrySetSelectedHealthcard(List<enumFasdInformationClass> informationClasses)
         {
-            try
+            var _hc = GetAvailableHealthCard(informationClasses);
+            if (_hc != null)
             {
-                if (newRawData is null)
-                    return;
-
-                foreach (var tableName in newRawData.Tables.Keys)
-                {
-                    try
-                    {
-                        if (HealthCardRawData.Tables.TryGetValue(tableName, out var oldTable) == false)
-                            continue;
-
-                        if (newRawData.Tables.TryGetValue(tableName, out var newTable) == false)
-                            continue;
-
-                        foreach (var oldColumn in oldTable.Columns)
-                        {
-                            try
-                            {
-                                if (newTable.Columns.TryGetValue(oldColumn.Key, out var newTableColumn) == false)
-                                    continue;
-
-                                if (newTable.TableType != eDataHistoryTableType.HistoryEvents)
-                                {
-                                    if (newTableColumn.Values is null || newTableColumn.Values?.Count <= 0)
-                                        continue;
-                                    if (oldColumn.Value?.Values is null || oldColumn.Value.Values.Count <= 0)
-                                        continue;
-
-                                    oldColumn.Value.Values[0] = newTableColumn.Values[0];
-                                }
-                                else
-                                    oldColumn.Value.Values = newTableColumn.Values;
-
-                            }
-                            catch (Exception E)
-                            {
-                                LogException(E);
-                            }
-                        }
-                    }
-                    catch (Exception E)
-                    {
-                        LogException(E);
-                    }
-                }
-
-                SelectedHealthCard.DoComputations(HealthCardRawData);
-                LogEntry("DataChanged - Update Latest Values finished.");
-                DataChanged?.Invoke(this, EventArgs.Empty);
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-        }
-
-        public async Task RefreshLatestDataAsync()
-        {
-            var CM = MethodBase.GetCurrentMethod();
-            LogMethodBegin(CM);
-            try
-            {
-                if (dataProvider.DirectConnectionHelper.IsDirectConnectionActive)
-                {
-                    var actualizeResult = await ActualizeDataAsync();
-
-                    if (actualizeResult == enumActualizeStatus.failed)
-                        LogEntry("Failed to actualize data, due to server timeout.", LogLevels.Error);
-                }
-
-                var requiredTables = HealthCardRawData.Tables.Keys.Where(tableKey => tableKey.StartsWith("Computation_") is false).ToList();
-
-                if (requiredTables is null || requiredTables.Count <= 0)
-                    return;
-
-                var request = new cF4sdHealthCardRawDataRequest() { Identities = dataProvider.Identities, Tables = requiredTables, MaxAge = cF4SDCockpitXmlConfig.Instance?.HealthCardConfig?.SearchResultAge ?? 14 }; //todo: reduce requested days to 1
-
-
-                await LoadingRawDataCriticalSection.EnterAsync();
-
-                try
-                {
-                    var newRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(request);
-
-                    UpdateLatestValues(newRawData);
-
-                    bool isRawDataIncomplete = false;
-                    do
-                    {
-                        isRawDataIncomplete = false;
-
-                        if (newRawData != null)
-                        {
-                            newRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(newRawData.Id);
-                            UpdateLatestValues(newRawData);
-                        }
-
-                        if (newRawData?.Tables?.Count > 0)
-                            if (newRawData.Tables.Values.Any(table => table.IsIncomplete))
-                                isRawDataIncomplete = true;
-
-                    } while (isRawDataIncomplete);
-
-                    LastDataRequest = DateTime.Now;
-                    DataRefreshed?.Invoke(this, EventArgs.Empty);
-                    DataFullyLoaded?.Invoke(this, EventArgs.Empty);
-                }
-                catch (Exception E)
-                {
-                    LogException(E);
-                }
-
-                LoadingRawDataCriticalSection.Leave();
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-            finally
-            {
-                LogMethodEnd(CM);
-            }
-        }
-
-        private bool CheckUpdatedTable(KeyValuePair<string, cF4SDHealthCardRawData.cHealthCardTable> table, cF4SDHealthCardRawData updatedHealthCardRawData)
-        {
-            if (!(updatedHealthCardRawData?.Tables?.ContainsKey(table.Key) is true))
-                return false;
-
-            var _res = WasTableUpdated(table.Value, updatedHealthCardRawData.Tables[table.Key]);
-            return _res;
-        }
-
-        private async Task ContinueHealthCardDataLoadingAsync()
-        {
-
-            var CM = MethodBase.GetCurrentMethod();
-            LogMethodBegin(CM);
-            try
-            {
-                var IsDataIncomplete = true;
-                do
-                {
-                    try
-                    {
-                        var updatedHealthCardRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(HealthCardRawData.Id);
-
-                        lock (HealthCardRawData)
-                        {
-
-                            var incompleteRawTables = HealthCardRawData.Tables.Where(table => table.Value.IsIncomplete
-                                                    && table.Key.StartsWith("Computation_") == false)
-                                              .ToDictionary(table => table.Key, table => table.Value);
-
-                            if (updatedHealthCardRawData is null)
-                            {
-                                var _msg = new List<string>
-                                {
-                                    $"Couldn't recieve complete healthcard raw data with id {HealthCardRawData?.Id}.",
-                                    " Incomplete health cards:"
-                                };
-
-                                foreach (var incompleteTable in HealthCardRawData.Tables.Where(table => table.Value.IsIncomplete))
-                                {
-                                    _msg.Add($"  {incompleteTable.Value.Name}");
-                                    foreach (var incompleteColumn in incompleteTable.Value.Columns.Values.Where(column => column.IsIncomplete))
-                                    {
-                                        incompleteColumn.IsIncomplete = false;
-                                    }
-
-                                    incompleteTable.Value.IsIncomplete = false;
-                                }
-
-                                cLogManager.DefaultLogger.LogList(LogLevels.Error, _msg);
-
-                                SelectedHealthCard.DoComputations(HealthCardRawData);
-                                LogEntry("DataChanged - Couldn't complete healthcard raw data.");
-                                DataChanged?.Invoke(this, EventArgs.Empty);
-                                break;
-                            }
-
-                            var rawTablesToUpdate = incompleteRawTables.Where(table => CheckUpdatedTable(table, updatedHealthCardRawData)).ToDictionary(table => table.Key, table => table.Value);
-
-                            foreach (var oldTable in rawTablesToUpdate)
-                            {
-                                if (oldTable.Key.ToLowerInvariant() == "nxt-user")
-                                {
-
-                                }
-
-
-                                var newTable = updatedHealthCardRawData.Tables[oldTable.Key];
-                                var oldTableValues = HealthCardRawData.Tables[oldTable.Key];
-
-                                cF4SDHealthCardRawData.cHealthCardTable mergedTable = oldTableValues;
-
-                                foreach (var newTableColumnKeys in newTable.Columns.Keys)
-                                {
-                                    if (mergedTable.Columns.ContainsKey(newTableColumnKeys) == false)
-                                        mergedTable.Columns[newTableColumnKeys] = new cF4SDHealthCardRawData.cHealthCardTableColumn();
-
-                                    int mergedTableColumnValueCount = mergedTable.Columns[newTableColumnKeys].Values.Count;
-                                    int mergedTableColumnLength = Math.Max(mergedTable.StartingIndex + mergedTableColumnValueCount, newTable.StartingIndex + newTable.Columns[newTableColumnKeys].Values.Count); //mergedTable.Columns[newTableColumnKeys].Values.Count + newTable.Columns.Count;
-                                    object[] mergedTableColumnValues = new object[mergedTableColumnLength];
-
-                                    for (int i = mergedTable.StartingIndex; i < mergedTable.StartingIndex + mergedTableColumnValueCount; i++)
-                                    {
-                                        mergedTableColumnValues[i] = mergedTable.Columns[newTableColumnKeys].Values[i - mergedTable.StartingIndex];
-                                    }
-
-                                    for (int i = newTable.StartingIndex; i < newTable.StartingIndex + newTable.Columns[newTableColumnKeys].Values.Count; i++)
-                                    {
-                                        mergedTableColumnValues[i] = newTable.Columns[newTableColumnKeys].Values[i - newTable.StartingIndex];
-                                    }
-
-                                    int newStartingIndex = Math.Min(mergedTable.StartingIndex, newTable.StartingIndex);
-                                    mergedTable.Columns[newTableColumnKeys].Values = mergedTableColumnValues.Skip(newStartingIndex).ToList();
-                                    mergedTable.Columns[newTableColumnKeys].IsIncomplete = newTable.Columns[newTableColumnKeys].IsIncomplete;
-                                    mergedTable.StartingIndex = newStartingIndex;
-                                    mergedTable.IsIncomplete = newTable.IsIncomplete;
-                                }
-
-                                HealthCardRawData.Tables[oldTable.Key] = mergedTable;
-                            }
-
-                            IsDataIncomplete = HealthCardRawData.Tables.Where(table => table.Key.StartsWith("Computation_") == false)
-                                                     .Any(table => table.Value.IsIncomplete);
-
-                            if (rawTablesToUpdate?.Count > 0)
-                            {
-                                SelectedHealthCard.DoComputations(HealthCardRawData);
-                                LogEntry($"DataChanged - {rawTablesToUpdate.Count} Tables where updated with last GetHealthcardData-Request.");
-                                DataChanged?.Invoke(this, EventArgs.Empty);
-                            }
-                        }
-                    }
-                    catch (Exception E)
-                    {
-                        LogException(E);
-                    }
-                } while (IsDataIncomplete);
-
-                DataFullyLoaded?.Invoke(this, new EventArgs());
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-            finally
-            {
-                LoadingRawDataCriticalSection.Leave();
-                LogMethodEnd(CM);
-            }
-        }
-
-        public async Task<bool> GetHealthCardRawDataAsync(cF4sdHealthCardRawDataRequest requestData)
-        {
-            var CM = MethodBase.GetCurrentMethod();
-            var IsDataIncomplete = true;
-            LogMethodBegin(CM);
-            try
-            {
-                if (SelectedHealthCard == null)
-                {
-                    LogEntry("No valid healthcard was found.");
-                    return false;
-                }
-
-                dataProvider.Identities = requestData.Identities;
-                var requestedTables = requestData.Tables;
-
-                HealthCardRawData.RemoveEmptyTables();
-                var requiredTables = requestedTables.Where(value => HealthCardRawData.Tables.ContainsKey(value) == false && value.StartsWith("Computation_") == false).ToList();
-
-                Mouse.OverrideCursor = Cursors.Wait;
-
-                cF4SDHealthCardRawData newHealthCardRawData = null;
-
-                await LoadingRawDataCriticalSection.EnterAsync();
-                IsDataIncomplete = false;
-
-                if (requiredTables?.Count > 0)
-                {
-                    requestData.Tables = requiredTables;
-
-
-                    newHealthCardRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(requestData);
-                    if (newHealthCardRawData == null)
-                        return false;
-                }
-
-
-                if (newHealthCardRawData != null)
-                    HealthCardRawData = HealthCardRawData.Combine(newHealthCardRawData);
-
-                UpdateNamedParameterEntries();
-
-                IsDataIncomplete = HealthCardRawData.Tables.Where(table => table.Key.StartsWith("Computation_") == false)
-                                                                         .ToList()
-                                                                         .Any(table => table.Value.IsIncomplete);
-
-
-                if (IsDataIncomplete)
-                {
-                    var _ = Task.Run(ContinueHealthCardDataLoadingAsync);
-                }
-
-                lock (HealthCardRawData)
-                {
-                    SelectedHealthCard.DoComputations(HealthCardRawData);
-                }
-
-                LogEntry("DataChanged - Finished getting Healthcard rawdata.");
-                DataChanged?.Invoke(this, new BooleanEventArgs() { BooleanArg = true });
-                UpdateNamedParameterEntries();
-
-
-                if (IsDataIncomplete is false)
-                    DataFullyLoaded?.Invoke(this, new EventArgs());
-
+                SelectedHealthCard = _hc;
                 return true;
             }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-            finally
-            {
-                if (IsDataIncomplete is false)
-                    LoadingRawDataCriticalSection.Leave();
-
-                Mouse.OverrideCursor = null;
-                LogMethodEnd(CM);
-            }
-
             return false;
         }
 
-        #endregion
+        #endregion GetHealthCardData
 
         #region Helper
 
@@ -707,31 +284,6 @@ namespace FasdDesktopUi.Basics.Helper
             return output;
         }
 
-        private bool IsValueIncomplete(cValueAddress databaseInfo, bool isStatic)
-        {
-            try
-            {
-                var healthCardTable = HealthCardRawData.GetTableByName(databaseInfo.ValueTable, isStatic);
-
-                if (healthCardTable is null)
-                    return false;
-
-                if (!healthCardTable.IsIncomplete)
-                    return false;
-
-                if (!healthCardTable.Columns.TryGetValue(databaseInfo.ValueColumn, out var column))
-                    return true;
-
-                return column.IsIncomplete;
-            }
-            catch (Exception e)
-            {
-                LogException(e);
-            }
-
-            return false;
-        }
-
         private object GetStateValueAt(cValueAddress DatabaseInfo, int index, bool isStatic)
         {
             var stateValues = GetStateValues(DatabaseInfo, isStatic);
@@ -742,7 +294,6 @@ namespace FasdDesktopUi.Basics.Helper
             return stateValues[index];
         }
 
-
         private enumHighlightColor GetHighlightColorWithReference(object rawValue, cHealthCardStateBase stateDefinition)
         {
             try
@@ -774,7 +325,6 @@ namespace FasdDesktopUi.Basics.Helper
             return enumHighlightColor.none;
         }
 
-
         private enumHighlightColor GetHighlightColor(object value, cHealthCardStateBase stateDefinition, int referenceDays = 0)
         {
             return GetHighlightColor(new cStateThresholdValues() { Value = value, StateDefinition = stateDefinition, ReferenceDays = referenceDays });
@@ -911,33 +461,6 @@ namespace FasdDesktopUi.Basics.Helper
             return output;
         }
 
-        private bool WasTableUpdated(cF4SDHealthCardRawData.cHealthCardTable oldTable, cF4SDHealthCardRawData.cHealthCardTable newTable)
-        {
-            try
-            {
-                if (oldTable.IsIncomplete && !newTable.IsIncomplete)
-                    return true;
-
-                if (oldTable.StartingIndex != newTable.StartingIndex)
-                    return true;
-
-                foreach (var oldTableColumn in oldTable.Columns.Values)
-                {
-                    if (!newTable.Columns.TryGetValue(oldTableColumn.ColumnName, out var newTableColumn))
-                        continue;
-
-                    if (oldTableColumn.Values.Count != newTableColumn.Values.Count)
-                        return true;
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return false;
-        }
-
         private cUiActionBase GetUiActionByQuickActionNames(List<string> names, string uiActionName, string uiActionDescription)
         {
             try
@@ -1000,9 +523,9 @@ namespace FasdDesktopUi.Basics.Helper
             }
         }
 
-        private DetailsPageDataHistoryValueModel GetTitleColumnOfHealthCardState(cHealthCardStateBase stateDefinition)
+        private cDataHistoryValueModel GetTitleColumnOfHealthCardState(cHealthCardStateBase stateDefinition)
         {
-            DetailsPageDataHistoryValueModel output = null;
+            cDataHistoryValueModel output = null;
 
             try
             {
@@ -1011,7 +534,7 @@ namespace FasdDesktopUi.Basics.Helper
                 var titleRowPresentationStyle = stateDefinition is cHealthCardStateAggregation ? enumHistoryTitleType.aggregate : enumHistoryTitleType.header;
                 cUiActionBase titleRowQuickAction = GetUiActionByQuickActionNames(stateDefinition.QuickActions, stateDefinition.Names.GetValue(), stateDefinition.Descriptions.GetValue(Default: null));
 
-                output = new DetailsPageDataHistoryValueModel() { Content = titleRowContent, ContentDescription = titleRowDescription, PresentationStyle = titleRowPresentationStyle, UiAction = titleRowQuickAction };
+                output = new cDataHistoryValueModel() { Content = titleRowContent, ContentDescription = titleRowDescription, PresentationStyle = titleRowPresentationStyle, UiAction = titleRowQuickAction };
             }
             catch (Exception E)
             {
@@ -1195,6 +718,38 @@ namespace FasdDesktopUi.Basics.Helper
             return outputDictionary.Values.ToList();
         }
 
+        public async Task<List<cHeadingDataModel>> UpdateOnlineStatusAsync()
+        {
+            try
+            {
+                if (HeadingData is null)
+                    return null;
+
+                if (dataProvider.NamedParameterEntries.TryGetValue("AgentDeviceId", out var agentDeviceIdParameter))
+                    if (int.TryParse(agentDeviceIdParameter.GetValue(), out int agentDeviceId))
+                        HeadingData[enumFasdInformationClass.Computer].IsOnline = await cFasdCockpitCommunicationBase.Instance.GetAgentOnlineStatus(agentDeviceId);
+
+                if (dataProvider.NamedParameterEntries.TryGetValue("AgentDeviceId", out var agentDeviceIdParameterUserContext))
+                    if (int.TryParse(agentDeviceIdParameterUserContext.GetValue(), out int agentDeviceId))
+                        if (dataProvider.NamedParameterEntries.TryGetValue("AgentUserId", out var agentUserIdParameter))
+                            if (int.TryParse(agentUserIdParameter.GetValue(), out int agentUserId))
+                                HeadingData[enumFasdInformationClass.User].IsOnline = await cFasdCockpitCommunicationBase.Instance.GetAgentOnlineStatus(agentDeviceId, agentUserId);
+            }
+            catch (Exception E)
+            {
+                LogException(E);
+            }
+
+            return HeadingData?.Values?.ToList();
+        }
+
+        public string GetInformationObjectHeadingName(enumFasdInformationClass InfoClass)
+        {
+            if (HeadingData.TryGetValue(enumFasdInformationClass.Computer, out var computerHeadingData))
+                return computerHeadingData.HeadingText;
+            return null;
+        }
+
         private async Task<List<cHeadingDataModel>> GetHeadingDataAsync()
         {
             Dictionary<enumFasdInformationClass, cHeadingDataModel> outputDictionary = new Dictionary<enumFasdInformationClass, cHeadingDataModel>();
@@ -1317,502 +872,12 @@ namespace FasdDesktopUi.Basics.Helper
             return outputDictionary.Values.ToList();
         }
 
-        public async Task<List<cHeadingDataModel>> UpdateOnlineStatusAsync()
-        {
-            try
-            {
-                if (HeadingData is null)
-                    return null;
-
-                if (dataProvider.NamedParameterEntries.TryGetValue("AgentDeviceId", out var agentDeviceIdParameter))
-                    if (int.TryParse(agentDeviceIdParameter.GetValue(), out int agentDeviceId))
-                        HeadingData[enumFasdInformationClass.Computer].IsOnline = await cFasdCockpitCommunicationBase.Instance.GetAgentOnlineStatus(agentDeviceId);
-
-                if (dataProvider.NamedParameterEntries.TryGetValue("AgentDeviceId", out var agentDeviceIdParameterUserContext))
-                    if (int.TryParse(agentDeviceIdParameterUserContext.GetValue(), out int agentDeviceId))
-                        if (dataProvider.NamedParameterEntries.TryGetValue("AgentUserId", out var agentUserIdParameter))
-                            if (int.TryParse(agentUserIdParameter.GetValue(), out int agentUserId))
-                                HeadingData[enumFasdInformationClass.User].IsOnline = await cFasdCockpitCommunicationBase.Instance.GetAgentOnlineStatus(agentDeviceId, agentUserId);
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return HeadingData?.Values?.ToList();
-        }
-
         private List<cMenuDataBase> GetMenuBarData() => _menuDataProvider.GetMenuItemData()
             .Where(data => (data.MenuSections?.Count == 0 || data.IconPositionIndex > -1) && data.UiAction?.DisplayType != enumActionDisplayType.hidden)
             .ToList();
 
         #endregion
 
-
-        #region Customizable Section
-
-        public List<cContainerData> GetContainerDataFromConfig(cHealthCardStateContainer containerConfig)
-        {
-            List<cContainerData> output = new List<cContainerData>();
-            try
-            {
-                if (containerConfig is null)
-                    return null;
-
-                List<IContainerHelperClass> containerHelpers = new List<IContainerHelperClass>();
-
-                foreach (var stateContainerElementConfig in containerConfig.StateContainerElements)
-                {
-                    var containerHelper = GetContainerHelperFromConfigElement(stateContainerElementConfig);
-                    containerHelpers.Add(containerHelper);
-                }
-
-                if (containerHelpers?.Count <= 0)
-                    return null;
-
-                int maxValueCountOfContainerHelpers = containerHelpers.Max(helper => helper.MaxValueCount);
-
-                for (int i = 0; i < maxValueCountOfContainerHelpers; i++)
-                {
-                    var containerToAdd = new cContainerData() { IsMaximizable = containerConfig.IsMaximizable, IsAddable = containerConfig.IsAddable, IsDeletable = containerConfig.IsDeletable };
-
-                    bool shouldSkipContainer = false;
-                    foreach (var containerHelper in containerHelpers)
-                    {
-                        var containerValue = GetContainerDataAtIndexFromHelper(containerHelper, i);
-                        containerToAdd.Add(containerValue);
-
-                        if (containerHelper.IsValueRequired && containerValue.HasValue is false)
-                            shouldSkipContainer = true;
-                    }
-
-                    if (shouldSkipContainer)
-                        continue;
-
-                    output.Add(containerToAdd);
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-            return output;
-        }
-
-
-        private IContainerData GetContainerDataAtIndexFromHelper(IContainerHelperClass containerHelper, int index = 0)
-        {
-            IContainerData output = null;
-
-            try
-            {
-                switch (containerHelper)
-                {
-                    case cContainerValueHelper containerValue:
-                        {
-                            string displayValue = string.Empty;
-                            cEditableValueInformationBase editableValueInformation = containerValue.EditableValueInformation;
-
-                            if (containerValue.RawValues.Count > index)
-                            {
-                                displayValue = cUtility.RawValueFormatter.GetDisplayValue(containerValue.RawValues[index], containerValue.DisplayType);
-
-                                if (editableValueInformation != null)
-                                    editableValueInformation.CurrentValue = containerValue.RawValues[index];
-                            }
-
-                            string maximizeValue = string.Empty;
-                            if (containerValue.RawMaximizeValues.Count > index)
-                                maximizeValue = cUtility.RawValueFormatter.GetDisplayValue(containerValue.RawMaximizeValues[index], containerValue.DisplayType);
-
-                            output = new cContainerValue()
-                            {
-                                DisplayValue = displayValue,
-                                MaximizeValue = maximizeValue,
-                                FontSize = containerValue.FontSize,
-                                FontWeight = containerValue.FontWeight,
-                                Description = containerValue.Description,
-                                IsEditOnly = containerValue.IsEditOnly,
-                                EditableValueInformation = editableValueInformation
-                            };
-
-                            break;
-                        }
-                    case cContainerIconHelper containerIcon:
-                        {
-                            output = new cContainerIcon(enumInternIcons.none);
-                            if (containerIcon.Icons.Count > index)
-                                output = containerIcon.Icons[index];
-                            break;
-                        }
-                    case cContainerStackPanelHelper containerStackPanel:
-                        {
-                            var outputStackPanelData = new List<IContainerData>();
-
-                            foreach (var stackPanelData in containerStackPanel.StackPanelHelperData)
-                            {
-                                try
-                                {
-                                    var dataToAdd = GetContainerDataAtIndexFromHelper(stackPanelData, index);
-                                    outputStackPanelData.Add(dataToAdd);
-                                }
-                                catch (Exception E)
-                                {
-                                    LogException(E);
-                                }
-                            }
-
-                            output = new cContainerStackPanel()
-                            {
-                                StackPanelData = outputStackPanelData,
-                                Orientation = containerStackPanel.Orientation
-                            };
-
-                            break;
-                        }
-                    case cContainerContentHelper containerContent:
-                        {
-                            var outputContentData = GetContainerDataAtIndexFromHelper(containerContent.Content, index);
-                            output = new cContainerPrimaryContent() { Value = outputContentData };
-                            break;
-                        }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private FontWeight GetFontWeightFromConfigFontWeight(enumFontWeights configFontWeight)
-        {
-            var output = FontWeights.Normal;
-            try
-            {
-                switch (configFontWeight)
-                {
-                    case enumFontWeights.Thin:
-                        output = FontWeights.Thin;
-                        break;
-                    case enumFontWeights.ExtraLight:
-                        output = FontWeights.ExtraLight;
-                        break;
-                    case enumFontWeights.UltraLight:
-                        output = FontWeights.UltraLight;
-                        break;
-                    case enumFontWeights.Light:
-                        output = FontWeights.Light;
-                        break;
-                    case enumFontWeights.Normal:
-                        output = FontWeights.Normal;
-                        break;
-                    case enumFontWeights.Regular:
-                        output = FontWeights.Regular;
-                        break;
-                    case enumFontWeights.Medium:
-                        output = FontWeights.Medium;
-                        break;
-                    case enumFontWeights.DemiBold:
-                        output = FontWeights.DemiBold;
-                        break;
-                    case enumFontWeights.SemiBold:
-                        output = FontWeights.SemiBold;
-                        break;
-                    case enumFontWeights.Bold:
-                        output = FontWeights.Bold;
-                        break;
-                    case enumFontWeights.ExtraBold:
-                        output = FontWeights.ExtraBold;
-                        break;
-                    case enumFontWeights.UltraBold:
-                        output = FontWeights.UltraBold;
-                        break;
-                    case enumFontWeights.Black:
-                        output = FontWeights.Black;
-                        break;
-                    case enumFontWeights.Heavy:
-                        output = FontWeights.Heavy;
-                        break;
-                    case enumFontWeights.ExtraBlack:
-                        output = FontWeights.ExtraBlack;
-                        break;
-                    case enumFontWeights.UltraBlack:
-                        output = FontWeights.UltraBlack;
-                        break;
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-            return output;
-        }
-
-        private IContainerData GetPlaceHolderContainerDataFromConfigElement(IStateContainerElement stateContainerElementConfig)
-        {
-            IContainerData output = null;
-
-            try
-            {
-                switch (stateContainerElementConfig)
-                {
-                    case cHealthCardStateStylable stylableStateConfig:
-                        {
-                            var fontWeight = GetFontWeightFromConfigFontWeight(stylableStateConfig.FontWeight);
-
-                            output = new cContainerValue()
-                            {
-                                DisplayValue = stylableStateConfig.Names.GetValue(),
-                                FontSize = stylableStateConfig.FontSize,
-                                FontWeight = fontWeight,
-                                Description = GetTitleColumnOfHealthCardState(stylableStateConfig).ContentDescription,
-                            };
-
-                            break;
-                        }
-                    case cHealthCardStateIconTranslation iconTranslationStateConfig:
-                        {
-                            output = new cContainerIcon() { IconType = enumIconType.intern, IconName = "f4sd" };
-                            break;
-                        }
-                    case cHealthCardStateStackPanel stackPanelConfig:
-                        {
-                            var orientation = Orientation.Horizontal;
-                            Enum.TryParse(stackPanelConfig.Orientation.ToString(), out orientation);
-
-                            var stackPanelData = new List<IContainerData>();
-                            foreach (var stackPanelState in stackPanelConfig.Children)
-                            {
-                                var childData = GetPlaceHolderContainerDataFromConfigElement(stackPanelState);
-                                stackPanelData.Add(childData);
-                            }
-
-                            output = new cContainerStackPanel() { Orientation = orientation, StackPanelData = stackPanelData };
-                            break;
-                        }
-                    case cHealthCardStateContainerContent containerContentConfig:
-                        {
-                            var content = GetPlaceHolderContainerDataFromConfigElement(containerContentConfig.Content);
-                            output = new cContainerPrimaryContent() { Value = content };
-                            break;
-                        }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private IContainerHelperClass GetContainerHelperFromConfigElement(IStateContainerElement stateContainerElementConfig)
-        {
-            IContainerHelperClass output = null;
-
-            try
-            {
-                switch (stateContainerElementConfig)
-                {
-                    case cHealthCardStateStylable stylableStateConfig:
-                        {
-                            var values = GetStateValues(stylableStateConfig.DatabaseInfo, false);
-                            var display = stylableStateConfig.DisplayType;
-                            var maximingValues = GetStateValues(stylableStateConfig.MaximizedDatabaseInfo, false);
-                            var fontWeight = GetFontWeightFromConfigFontWeight(stylableStateConfig.FontWeight);
-
-                            cEditableValueInformationBase editableInformation = null;
-                            if (stylableStateConfig.EditInfo != null)
-                            {
-                                switch (stylableStateConfig.EditInfo)
-                                {
-                                    case cStateEditableSelection edtiableSelectionInfo:
-                                        var editSelectionValues = GetEditInformationSelectionValues(stylableStateConfig);
-                                        editableInformation = new cEditValueInformationSelection() { DatabaseInfo = stylableStateConfig.DatabaseInfo, SelectionValues = editSelectionValues, Description = stylableStateConfig.Names.GetValue() };
-                                        break;
-                                    case cStateEditableText editableTextInfo:
-                                        editableInformation = new cEditValueInformationText() { DatabaseInfo = stylableStateConfig.DatabaseInfo, Description = stylableStateConfig.Names.GetValue() };
-                                        break;
-                                    default:
-                                        break;
-
-                                }
-                            }
-
-                            output = new cContainerValueHelper()
-                            {
-                                RawValues = values,
-                                RawMaximizeValues = maximingValues,
-                                DisplayType = cUtility.GetRawValueType(display),
-                                Description = GetTitleColumnOfHealthCardState(stylableStateConfig).ContentDescription,
-                                FontSize = stylableStateConfig.FontSize,
-                                FontWeight = fontWeight,
-                                EditableValueInformation = editableInformation,
-                                IsValueRequired = stateContainerElementConfig.IsRequired
-                            };
-                            break;
-                        }
-                    case cHealthCardStateIconTranslation iconTranslationStateConfig:
-                        {
-                            var rawValues = GetStateValues(iconTranslationStateConfig.DatabaseInfo, false);
-                            var translation = cF4SDHealthCardConfig.GetTranslationsWithName(iconTranslationStateConfig, iconTranslationStateConfig.Translation);
-                            var icons = new List<cContainerIcon>();
-
-                            foreach (var rawValue in rawValues)
-                            {
-                                var iconName = "none";
-                                enumIconType iconType = enumIconType.intern;
-                                enumHighlightColor highlightColor = enumHighlightColor.none;
-
-                                if (translation is cHealthCardIconTranslator iconTranslation)
-                                {
-                                    var selectedTranslation = iconTranslation.IconTranslations.FirstOrDefault(tempTranslation => tempTranslation.Values.Contains(rawValue)) ?? iconTranslation.DefaultIconTranslation;
-                                    if (selectedTranslation != null)
-                                    {
-                                        iconName = selectedTranslation.Icon.Name;
-                                        iconType = selectedTranslation.Icon.IconType;
-
-                                        switch (selectedTranslation.StateLevel)
-                                        {
-                                            case enumHealthCardStateLevel.Ok:
-                                                highlightColor = enumHighlightColor.green;
-                                                break;
-                                            case enumHealthCardStateLevel.Warning:
-                                                highlightColor = enumHighlightColor.orange;
-                                                break;
-                                            case enumHealthCardStateLevel.Error:
-                                                highlightColor = enumHighlightColor.red;
-                                                break;
-                                            case enumHealthCardStateLevel.Info:
-                                                highlightColor = enumHighlightColor.blue;
-                                                break;
-                                        }
-
-                                        string toolTipText = selectedTranslation.Descriptions.GetValue(null, string.Empty);
-
-                                        icons.Add(new cContainerIcon() { IconName = iconName, IconType = iconType, HighlightColor = highlightColor, ToolTipText = toolTipText });
-                                    }
-                                }
-                            }
-
-                            output = new cContainerIconHelper() { Icons = icons, IsValueRequired = stateContainerElementConfig.IsRequired };
-                            break;
-                        }
-                    case cHealthCardStateStackPanel stackPanelConfig:
-                        {
-                            var orientation = Orientation.Horizontal;
-                            Enum.TryParse(stackPanelConfig.Orientation.ToString(), out orientation);
-
-                            var stackPanelData = new List<IContainerHelperClass>();
-                            foreach (var stackPanelState in stackPanelConfig.Children)
-                            {
-                                var childData = GetContainerHelperFromConfigElement(stackPanelState);
-                                stackPanelData.Add(childData);
-                            }
-
-                            output = new cContainerStackPanelHelper() { Orientation = orientation, StackPanelHelperData = stackPanelData, IsValueRequired = stateContainerElementConfig.IsRequired };
-                            break;
-                        }
-                    case cHealthCardStateContainerContent containerContentConfig:
-                        {
-                            var content = GetContainerHelperFromConfigElement(containerContentConfig.Content);
-                            output = new cContainerContentHelper() { Content = content, IsValueRequired = stateContainerElementConfig.IsRequired || content.IsValueRequired };
-                            break;
-                        }
-                    case cHealthCardStateEditable editableStateConfig:
-                        {
-                            cEditableValueInformationBase editableInformation = null;
-                            if (editableStateConfig.EditInfo is null)
-                                break;
-
-                            switch (editableStateConfig.EditInfo)
-                            {
-                                case cStateEditableSelection edtiableSelectionInfo:
-                                    var editSelectionValues = GetEditInformationSelectionValues(editableStateConfig);
-                                    editableInformation = new cEditValueInformationSelection() { DatabaseInfo = editableStateConfig.DatabaseInfo, SelectionValues = editSelectionValues, Description = editableStateConfig.Names.GetValue() };
-                                    break;
-                                case cStateEditableText editableTextInfo:
-                                    editableInformation = new cEditValueInformationText() { DatabaseInfo = editableStateConfig.DatabaseInfo, Description = editableStateConfig.Names.GetValue() };
-                                    break;
-                                default:
-                                    break;
-
-                            }
-
-                            output = new cContainerValueHelper()
-                            {
-                                RawValues = new List<object>() { editableStateConfig.Names.GetValue() },
-                                IsEditOnly = true,
-                                EditableValueInformation = editableInformation,
-                                IsValueRequired = stateContainerElementConfig.IsRequired
-                            };
-                            break;
-                        }
-                }
-
-
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private List<cContainerCollectionData> GetContainerCollectionData()
-        {
-            var CM = MethodBase.GetCurrentMethod();
-            LogMethodBegin(CM);
-
-            var output = new List<cContainerCollectionData>();
-
-            try
-            {
-                var customizableSectionConfig = SelectedHealthCard.CustomizableSection;
-
-                if (customizableSectionConfig is null)
-                    return output;
-
-                foreach (var containerConfigList in customizableSectionConfig.ContainerList)
-                {
-                    try
-                    {
-                        if (containerConfigList is null)
-                            continue;
-
-                        var containerCollectionToAdd = new cContainerCollectionData() { ColumnSpan = containerConfigList.ColumnSpan };
-
-                        foreach (var containerConfig in containerConfigList.StateContainers)
-                        {
-                            var containerValuesToAdd = GetContainerDataFromConfig(containerConfig);
-                            containerCollectionToAdd.AddRange(containerValuesToAdd);
-                        }
-
-                        output.Add(containerCollectionToAdd);
-                    }
-                    catch (Exception E)
-                    {
-                        LogException(E);
-                    }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-            finally
-            {
-                LogMethodEnd(CM);
-            }
-
-            return output;
-        }
-
-        #endregion
-
         #region NamedParameters
 
         public string ReplaceNamedParameters(string rawString, bool shouldUseHtml)
@@ -1880,7 +945,7 @@ namespace FasdDesktopUi.Basics.Helper
             return output;
         }
 
-        public void UpdateNamedParameterEntries()
+        private void UpdateNamedParameterEntries()
         {
             try
             {
@@ -1938,6 +1003,10 @@ namespace FasdDesktopUi.Basics.Helper
 
             protected cSupportCaseDataProvider dataProvider { get { return parent.dataProvider; } }
 
+            protected cHealthCard SelectedHealthCard { get { return parent.SelectedHealthCard; } }
+
+            protected cF4SDHealthCardRawData HealthCardRawData { get { return parent.HealthCardRawData; } }
+
             internal cHealthCardStateSubHelper(cHealthCardDataHelper parent)
             {
                 this.parent = parent;
@@ -1948,7 +1017,103 @@ namespace FasdDesktopUi.Basics.Helper
         {
             internal cHealthCardHistoryDataHelper(cHealthCardDataHelper parent) : base(parent) { }
 
-            private void ProcessState(cHealthCardStateBase stateDefinition, int valueColumnCount, bool isStatic, ref List<DetailsPageDataHistoryColumnModel> historySectionValueColumns)
+            internal cDetailsPageDataHistoryDataModel GetData()
+            {
+                var CM = MethodBase.GetCurrentMethod();
+                LogMethodBegin(CM);
+
+                cDetailsPageDataHistoryDataModel output = new cDetailsPageDataHistoryDataModel();
+                try
+                {
+                    var healthCardHistoryConfig = SelectedHealthCard.CategoriesHistory;
+
+                    if (healthCardHistoryConfig is null)
+                        return output;
+
+                    foreach (var stateCategoryDefinition in healthCardHistoryConfig.StateCategories)
+                    {
+                        if (!IsUiVisible(stateCategoryDefinition, dataProvider.NamedParameterEntries))
+                            continue;
+
+                        var categoryContent = stateCategoryDefinition.Names.GetValue();
+                        var categoryContentDescription = stateCategoryDefinition.Descriptions.GetValue(Default: categoryContent);
+                        cUiActionBase categoryQuickAction = parent.GetUiActionByQuickActionNames(stateCategoryDefinition.QuickActions, stateCategoryDefinition.Names.GetValue(), stateCategoryDefinition.Descriptions.GetValue(Default: null));
+
+                        var titleColumn = new DetailsPageDataHistoryColumnModel()                         //todo: refactor, see same code in titleRow
+                        {
+                            Content = categoryContent,
+                            ContentDescription = categoryContentDescription,
+                            UiAction = categoryQuickAction,
+                            ColumnValues = new List<cDataHistoryValueModel>()
+                        };
+
+                        // Adding columns to history section
+                        int valueColumnCount = SelectedHealthCard.MaxAgeInDays;
+                        var historySectionValueColumns = new List<DetailsPageDataHistoryColumnModel>(valueColumnCount);
+                        for (int i = 0; i < valueColumnCount; i++)
+                        {
+                            CultureInfo culture = new CultureInfo(cMultiLanguageSupport.CurrentLanguage);
+                            var valueColumnHeader = i != 0 ? DateTime.Today.AddDays(-i).ToString(cMultiLanguageSupport.GetItem("Global.Date.Format.ShortDateWithDay", "ddd. dd.MM."), culture) : cMultiLanguageSupport.GetItem("Global.Date.Today");
+                            var summaryStatusColor = parent.GetSummaryStatusColor(stateCategoryDefinition.States, false, i);
+                            var valueColumn = new DetailsPageDataHistoryColumnModel() { ColumnValues = new List<cDataHistoryValueModel>(), Content = valueColumnHeader, HighlightColor = summaryStatusColor };
+                            historySectionValueColumns.Add(valueColumn);
+                        }
+
+
+                        foreach (var stateDefinition in stateCategoryDefinition.States)
+                        {
+                            if (!IsUiVisible(stateDefinition, dataProvider.NamedParameterEntries))
+                                continue;
+
+                            if (stateDefinition.DatabaseInfo != null && HealthCardRawData.Tables.ContainsKey(stateDefinition.DatabaseInfo.ValueTable) == false)
+                                continue;
+
+                            var titleRowData = parent.GetTitleColumnOfHealthCardState(stateDefinition);
+                            if (titleRowData != null)
+                                titleColumn.ColumnValues.Add(titleRowData);
+
+                            ProcessState(stateDefinition, valueColumnCount, false, historySectionValueColumns);
+
+                            //StateAggregation
+                            if (stateDefinition is cHealthCardStateAggregation stateAggregationDefinition)
+                            {
+                                foreach (var aggregatedStateDefinition in stateAggregationDefinition.States)
+                                {
+                                    if (!IsUiVisible(aggregatedStateDefinition, dataProvider.NamedParameterEntries))
+                                        continue;
+
+                                    var aggregatedTitleRowData = parent.GetTitleColumnOfHealthCardState(aggregatedStateDefinition);
+                                    if (aggregatedStateDefinition != null)
+                                    {
+                                        aggregatedTitleRowData.PresentationStyle = enumHistoryTitleType.subValue;
+                                        titleColumn.ColumnValues.Add(aggregatedTitleRowData);
+                                    }
+
+                                    ProcessState(aggregatedStateDefinition, valueColumnCount, false, historySectionValueColumns);
+                                }
+                            }
+                        }
+
+                        output.Add(new cDetailsPageDataHistoryCategoryDataModel()
+                        {
+                            TitleColumn = titleColumn,
+                            ValueColumns = historySectionValueColumns
+                        });
+                    }
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+                finally
+                {
+                    LogMethodEnd(CM);
+                }
+
+                return output;
+            }
+
+            private void ProcessState(cHealthCardStateBase stateDefinition, int valueColumnCount, bool isStatic, List<DetailsPageDataHistoryColumnModel> historySectionValueColumns)
             {
                 var stateValues = parent.GetStateValues(stateDefinition.DatabaseInfo, isStatic);
 
@@ -2005,7 +1170,7 @@ namespace FasdDesktopUi.Basics.Helper
                     bool isStateRowLoading = false;
                     if (stateDefinition.DatabaseInfo != null)
                     {
-                        var stateTable = parent.HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, isStatic);
+                        var stateTable = HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, isStatic);
 
                         if (stateTable != null)
                         {
@@ -2021,14 +1186,14 @@ namespace FasdDesktopUi.Basics.Helper
 
                     if (stateDefinition.DatabaseInfo != null)
                     {
-                        var stateTable = parent.HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, isStatic);
+                        var stateTable = HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, isStatic);
 
                         if (stateTable != null)
                             if (stateTable.Columns.TryGetValue(stateDefinition.DatabaseInfo.ValueColumn, out var stateColumn))
                                 isStateRowLoading = stateColumn.IsIncomplete;
                     }
 
-                    var cellContent = new DetailsPageDataHistoryValueModel() { Content = cellContentString, HighlightColor = cellContentColor, IsLoading = isStateRowLoading, ThresholdValues = thresholdValues };
+                    var cellContent = new cDataHistoryValueModel() { Content = cellContentString, HighlightColor = cellContentColor, IsLoading = isStateRowLoading, ThresholdValues = thresholdValues };
 
                     if (stateDefinition.Details != null && stateValues?.Count > i && stateValues[i] != null)
                         cellContent.UiAction = new cShowDetailedDataAction(stateDefinition, i);
@@ -2037,89 +1202,26 @@ namespace FasdDesktopUi.Basics.Helper
                 }
             }
 
-            internal List<cDetailsPageDataHistoryDataModel> GetData()
+        }
+
+        public class cHealthCardSlimPageHelper : cHealthCardStateSubHelper
+        {
+            public async Task<cSlimPageData> GetDataAsync()
             {
                 var CM = MethodBase.GetCurrentMethod();
                 LogMethodBegin(CM);
 
-                List<cDetailsPageDataHistoryDataModel> output = new List<cDetailsPageDataHistoryDataModel>();
+                cSlimPageData output = new cSlimPageData();
                 try
                 {
-                    var healthCardHistoryConfig = parent.SelectedHealthCard.CategoriesHistory;
-
-                    if (healthCardHistoryConfig is null)
+                    if (SelectedHealthCard == null)
                         return output;
 
-                    foreach (var stateCategoryDefinition in healthCardHistoryConfig.StateCategories)
-                    {
-                        if (!IsUiVisible(stateCategoryDefinition, dataProvider.NamedParameterEntries))
-                            continue;
-
-                        var categoryContent = stateCategoryDefinition.Names.GetValue();
-                        var categoryContentDescription = stateCategoryDefinition.Descriptions.GetValue(Default: categoryContent);
-                        cUiActionBase categoryQuickAction = parent.GetUiActionByQuickActionNames(stateCategoryDefinition.QuickActions, stateCategoryDefinition.Names.GetValue(), stateCategoryDefinition.Descriptions.GetValue(Default: null));
-
-                        var titleColumn = new DetailsPageDataHistoryColumnModel()                         //todo: refactor, see same code in titleRow
-                        {
-                            Content = categoryContent,
-                            ContentDescription = categoryContentDescription,
-                            UiAction = categoryQuickAction,
-                            ColumnValues = new List<DetailsPageDataHistoryValueModel>()
-                        };
-
-                        // Adding columns to history section
-                        int valueColumnCount = parent.SelectedHealthCard.MaxAgeInDays;
-                        var historySectionValueColumns = new List<DetailsPageDataHistoryColumnModel>(valueColumnCount);
-                        for (int i = 0; i < valueColumnCount; i++)
-                        {
-                            CultureInfo culture = new CultureInfo(cMultiLanguageSupport.CurrentLanguage);
-                            var valueColumnHeader = i != 0 ? DateTime.Today.AddDays(-i).ToString(cMultiLanguageSupport.GetItem("Global.Date.Format.ShortDateWithDay", "ddd. dd.MM."), culture) : cMultiLanguageSupport.GetItem("Global.Date.Today");
-                            var summaryStatusColor = parent.GetSummaryStatusColor(stateCategoryDefinition.States, false, i);
-                            var valueColumn = new DetailsPageDataHistoryColumnModel() { ColumnValues = new List<DetailsPageDataHistoryValueModel>(), Content = valueColumnHeader, HighlightColor = summaryStatusColor };
-                            historySectionValueColumns.Add(valueColumn);
-                        }
-
-
-                        foreach (var stateDefinition in stateCategoryDefinition.States)
-                        {
-                            if (!IsUiVisible(stateDefinition, dataProvider.NamedParameterEntries))
-                                continue;
-
-                            if (stateDefinition.DatabaseInfo != null && parent.HealthCardRawData.Tables.ContainsKey(stateDefinition.DatabaseInfo.ValueTable) == false)
-                                continue;
-
-                            var titleRowData = parent.GetTitleColumnOfHealthCardState(stateDefinition);
-                            if (titleRowData != null)
-                                titleColumn.ColumnValues.Add(titleRowData);
-
-                            ProcessState(stateDefinition, valueColumnCount, false, ref historySectionValueColumns);
-
-                            //StateAggregation
-                            if (stateDefinition is cHealthCardStateAggregation stateAggregationDefinition)
-                            {
-                                foreach (var aggregatedStateDefinition in stateAggregationDefinition.States)
-                                {
-                                    if (!IsUiVisible(aggregatedStateDefinition, dataProvider.NamedParameterEntries))
-                                        continue;
-
-                                    var aggregatedTitleRowData = parent.GetTitleColumnOfHealthCardState(aggregatedStateDefinition);
-                                    if (aggregatedStateDefinition != null)
-                                    {
-                                        aggregatedTitleRowData.PresentationStyle = enumHistoryTitleType.subValue;
-                                        titleColumn.ColumnValues.Add(aggregatedTitleRowData);
-                                    }
-
-                                    ProcessState(aggregatedStateDefinition, valueColumnCount, false, ref historySectionValueColumns);
-                                }
-                            }
-                        }
-
-                        output.Add(new cDetailsPageDataHistoryDataModel()
-                        {
-                            TitleColumn = titleColumn,
-                            ValueColumns = historySectionValueColumns
-                        });
-                    }
+                    output.DataProvider = dataProvider;
+                    output.HeadingData = await parent.GetHeadingDataAsync();
+                    output.WidgetData = GetWidgetData();
+                    output.DataHistoryList = GetHistoryData();
+                    output.MenuBarData = parent.GetMenuBarData();
                 }
                 catch (Exception E)
                 {
@@ -2133,10 +1235,6 @@ namespace FasdDesktopUi.Basics.Helper
                 return output;
             }
 
-        }
-
-        public class cHealthCardSlimPageHelper : cHealthCardStateSubHelper
-        {
             internal cHealthCardSlimPageHelper(cHealthCardDataHelper parent) : base(parent) { }
 
             private List<List<cWidgetValueModel>> GetWidgetData()
@@ -2147,7 +1245,7 @@ namespace FasdDesktopUi.Basics.Helper
 
                 try
                 {
-                    var healthCardWidgetConfig = parent.SelectedHealthCard.CategoriesStaticSlim;
+                    var healthCardWidgetConfig = SelectedHealthCard.CategoriesStaticSlim;
 
                     foreach (var categoryDefinition in healthCardWidgetConfig.StateCategories)
                     {
@@ -2161,7 +1259,7 @@ namespace FasdDesktopUi.Basics.Helper
                             if (!IsUiVisible(stateDefinition, dataProvider.NamedParameterEntries))
                                 continue;
 
-                            if (parent.HealthCardRawData.Tables.ContainsKey(stateDefinition.DatabaseInfo?.ValueTable) == false)
+                            if (HealthCardRawData.Tables.ContainsKey(stateDefinition.DatabaseInfo?.ValueTable) == false)
                                 continue;
 
                             var stateModel = stateDefinition;
@@ -2215,7 +1313,7 @@ namespace FasdDesktopUi.Basics.Helper
                 List<cSlimPageDataHistoryModel> output = new List<cSlimPageDataHistoryModel>();
                 try
                 {
-                    var healthCardHistoryConfig = parent.SelectedHealthCard.CategoriesHistory;
+                    var healthCardHistoryConfig = SelectedHealthCard.CategoriesHistory;
 
                     if (healthCardHistoryConfig is null)
                         return output;
@@ -2242,7 +1340,7 @@ namespace FasdDesktopUi.Basics.Helper
 
                                 if (stateDefinition.DatabaseInfo != null)
                                 {
-                                    var stateTable = parent.HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, false);
+                                    var stateTable = HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, false);
                                     if (stateTable != null)
                                     {
                                         int tableColumnCount = 0;
@@ -2278,7 +1376,7 @@ namespace FasdDesktopUi.Basics.Helper
                                     continue;
                                 if (stateDefinition.DatabaseInfo != null)
                                 {
-                                    var stateTable = parent.HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, false);
+                                    var stateTable = HealthCardRawData.GetTableByName(stateDefinition.DatabaseInfo.ValueTable, false);
 
                                     if (stateTable != null)
                                     {
@@ -2321,21 +1419,26 @@ namespace FasdDesktopUi.Basics.Helper
                 return output;
             }
 
-            public async Task<cSlimPageData> GetDataAsync()
+        }
+
+        public class cHealthCardDetailPageHelper : cHealthCardStateSubHelper
+        {
+            public async Task<cDetailsPageData> GetDataAsync()
             {
                 var CM = MethodBase.GetCurrentMethod();
                 LogMethodBegin(CM);
 
-                cSlimPageData output = new cSlimPageData();
+                cDetailsPageData output = new cDetailsPageData();
                 try
                 {
-                    if (parent.SelectedHealthCard == null)
+                    if (SelectedHealthCard == null)
                         return output;
 
                     output.DataProvider = dataProvider;
                     output.HeadingData = await parent.GetHeadingDataAsync();
-                    output.WidgetData = GetWidgetData();
-                    output.DataHistoryList = GetHistoryData();
+                    output.WidgetData = GetWidgetsData();
+                    output.DataHistoryList = parent.HistoryData.GetData();
+                    output.DataContainerCollectionList = parent.CustomizableSectionHelper.GetContainerCollectionData();
                     output.MenuBarData = parent.GetMenuBarData();
                 }
                 catch (Exception E)
@@ -2350,10 +1453,27 @@ namespace FasdDesktopUi.Basics.Helper
                 return output;
             }
 
-        }
+            public cDetailsPageData GetDataWithoutHeading()
+            {
+                cDetailsPageData output = new cDetailsPageData();
+                try
+                {
+                    if (SelectedHealthCard == null)
+                        return output;
+
+                    output.DataProvider = dataProvider;
+                    output.WidgetData = GetWidgetsData();
+                    output.DataHistoryList = parent.HistoryData.GetData();
+                    output.DataContainerCollectionList = parent.CustomizableSectionHelper.GetContainerCollectionData();
+                    output.MenuBarData = parent.GetMenuBarData();
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+                return output;
+            }
 
-        public class cHealthCardDetailPageHelper : cHealthCardStateSubHelper
-        {
             internal cHealthCardDetailPageHelper(cHealthCardDataHelper parent) : base(parent) { }
 
             private cHealthCardDetailsTable GetDetailTableValued(object _value, cHealthCardDetailsValued StateDetailsValued)
@@ -2428,7 +1548,7 @@ namespace FasdDesktopUi.Basics.Helper
                     {
                         Title = stateDefinition.Names?.GetValue(),
                         TechnicalName = stateDefinition.ParameterName,
-                        IsLoading = parent.IsValueIncomplete(stateDefinition.DatabaseInfo, true),
+                        IsLoading = IsValueIncomplete(stateDefinition.DatabaseInfo, true),
                         Value = "N/A",
                         UiActionTitle = parent.GetUiActionByQuickActionNames(stateDefinition.QuickActions, stateDefinition.Names.GetValue(), stateDefinition.Descriptions.GetValue())
                     };
@@ -2549,7 +1669,7 @@ namespace FasdDesktopUi.Basics.Helper
 
                 try
                 {
-                    return parent.SelectedHealthCard.CategoriesStatic.StateCategories
+                    return SelectedHealthCard.CategoriesStatic.StateCategories
                         .Where(widgetDefinition => IsUiVisible(widgetDefinition, dataProvider.NamedParameterEntries))
                         .Select(widgetDefinition => GetWidgetData(widgetDefinition))
                         .ToList();
@@ -2582,19 +1702,529 @@ namespace FasdDesktopUi.Basics.Helper
                 }
             }
 
-            public cDetailsPageData GetDataWithoutHeading()
+            private bool IsValueIncomplete(cValueAddress databaseInfo, bool isStatic)
             {
-                cDetailsPageData output = new cDetailsPageData();
                 try
                 {
-                    if (parent.SelectedHealthCard == null)
-                        return output;
+                    var healthCardTable = HealthCardRawData.GetTableByName(databaseInfo.ValueTable, isStatic);
 
-                    output.DataProvider = dataProvider;
-                    output.WidgetData = GetWidgetsData();
-                    output.DataHistoryList = parent.HistoryData.GetData();
-                    output.DataContainerCollectionList = parent.GetContainerCollectionData();
-                    output.MenuBarData = parent.GetMenuBarData();
+                    if (healthCardTable is null)
+                        return false;
+
+                    if (!healthCardTable.IsIncomplete)
+                        return false;
+
+                    if (!healthCardTable.Columns.TryGetValue(databaseInfo.ValueColumn, out var column))
+                        return true;
+
+                    return column.IsIncomplete;
+                }
+                catch (Exception e)
+                {
+                    LogException(e);
+                }
+
+                return false;
+            }
+
+        }
+
+        public class cHealthCardDataLoadingHelper : cHealthCardStateSubHelper
+        {
+            public event EventHandler DataChanged;
+
+            public event EventHandler DataFullyLoaded;
+
+            public event EventHandler DataRefreshed;
+
+            public DateTime? LastDataRequest { get; set; } = null;
+
+            public async Task RefreshLatestDataAsync()
+            {
+                var CM = MethodBase.GetCurrentMethod();
+                LogMethodBegin(CM);
+                try
+                {
+                    if (dataProvider.DirectConnectionHelper.IsDirectConnectionActive)
+                    {
+                        var actualizeResult = await ActualizeDataAsync();
+
+                        if (actualizeResult == enumActualizeStatus.failed)
+                            LogEntry("Failed to actualize data, due to server timeout.", LogLevels.Error);
+                    }
+
+                    var requiredTables = HealthCardRawData.Tables.Keys.Where(tableKey => tableKey.StartsWith("Computation_") is false).ToList();
+
+                    if (requiredTables is null || requiredTables.Count <= 0)
+                        return;
+
+                    var request = new cF4sdHealthCardRawDataRequest() { Identities = dataProvider.Identities, Tables = requiredTables, MaxAge = cF4SDCockpitXmlConfig.Instance?.HealthCardConfig?.SearchResultAge ?? 14 }; //todo: reduce requested days to 1
+
+
+                    await LoadingRawDataCriticalSection.EnterAsync();
+
+                    try
+                    {
+                        var newRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(request);
+
+                        UpdateLatestValues(newRawData);
+
+                        bool isRawDataIncomplete = false;
+                        do
+                        {
+                            isRawDataIncomplete = false;
+
+                            if (newRawData != null)
+                            {
+                                newRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(newRawData.Id);
+                                UpdateLatestValues(newRawData);
+                            }
+
+                            if (newRawData?.Tables?.Count > 0)
+                                if (newRawData.Tables.Values.Any(table => table.IsIncomplete))
+                                    isRawDataIncomplete = true;
+
+                        } while (isRawDataIncomplete);
+
+                        LastDataRequest = DateTime.Now;
+                        DataRefreshed?.Invoke(this, EventArgs.Empty);
+                        DataFullyLoaded?.Invoke(this, EventArgs.Empty);
+                    }
+                    catch (Exception E)
+                    {
+                        LogException(E);
+                    }
+
+                    LoadingRawDataCriticalSection.Leave();
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+                finally
+                {
+                    LogMethodEnd(CM);
+                }
+            }
+
+            public async Task<bool> GetHealthCardRawDataAsync(cF4sdHealthCardRawDataRequest requestData)
+            {
+                var CM = MethodBase.GetCurrentMethod();
+                var IsDataIncomplete = true;
+                LogMethodBegin(CM);
+                try
+                {
+                    if (SelectedHealthCard == null)
+                    {
+                        LogEntry("No valid healthcard was found.");
+                        return false;
+                    }
+
+                    dataProvider.Identities = requestData.Identities;
+                    var requestedTables = requestData.Tables;
+
+                    HealthCardRawData.RemoveEmptyTables();
+                    var requiredTables = requestedTables.Where(value => HealthCardRawData.Tables.ContainsKey(value) == false && value.StartsWith("Computation_") == false).ToList();
+
+                    Mouse.OverrideCursor = Cursors.Wait;
+
+                    cF4SDHealthCardRawData newHealthCardRawData = null;
+
+                    await LoadingRawDataCriticalSection.EnterAsync();
+                    IsDataIncomplete = false;
+
+                    if (requiredTables?.Count > 0)
+                    {
+                        requestData.Tables = requiredTables;
+
+
+                        newHealthCardRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(requestData);
+                        if (newHealthCardRawData == null)
+                            return false;
+                    }
+
+
+                    if (newHealthCardRawData != null)
+                        parent.HealthCardRawData = HealthCardRawData.Combine(newHealthCardRawData);
+
+                    parent.UpdateNamedParameterEntries();
+
+                    IsDataIncomplete = HealthCardRawData.Tables.Where(table => table.Key.StartsWith("Computation_") == false)
+                                                                             .ToList()
+                                                                             .Any(table => table.Value.IsIncomplete);
+
+
+                    if (IsDataIncomplete)
+                    {
+                        var _ = Task.Run(ContinueHealthCardDataLoadingAsync);
+                    }
+
+                    lock (HealthCardRawData)
+                    {
+                        SelectedHealthCard.DoComputations(HealthCardRawData);
+                    }
+
+                    LogEntry("DataChanged - Finished getting Healthcard rawdata.");
+                    DataChanged?.Invoke(this, new BooleanEventArgs() { BooleanArg = true });
+                    parent.UpdateNamedParameterEntries();
+
+
+                    if (IsDataIncomplete is false)
+                        DataFullyLoaded?.Invoke(this, new EventArgs());
+
+                    return true;
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+                finally
+                {
+                    if (IsDataIncomplete is false)
+                        LoadingRawDataCriticalSection.Leave();
+
+                    Mouse.OverrideCursor = null;
+                    LogMethodEnd(CM);
+                }
+
+                return false;
+            }
+
+            internal cHealthCardDataLoadingHelper(cHealthCardDataHelper parent) : base(parent) { }
+
+            private bool WasTableUpdated(cF4SDHealthCardRawData.cHealthCardTable oldTable, cF4SDHealthCardRawData.cHealthCardTable newTable)
+            {
+                try
+                {
+                    if (oldTable.IsIncomplete && !newTable.IsIncomplete)
+                        return true;
+
+                    if (oldTable.StartingIndex != newTable.StartingIndex)
+                        return true;
+
+                    foreach (var oldTableColumn in oldTable.Columns.Values)
+                    {
+                        if (!newTable.Columns.TryGetValue(oldTableColumn.ColumnName, out var newTableColumn))
+                            continue;
+
+                        if (oldTableColumn.Values.Count != newTableColumn.Values.Count)
+                            return true;
+                    }
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+
+                return false;
+            }
+
+            private async Task<enumActualizeStatus> ActualizeDataAsync()
+            {
+                var output = enumActualizeStatus.unknown;
+
+                try
+                {
+                    const int refreshDelayInMilliseconds = 500;
+                    const int maxPollCount = 20;
+
+                    if (dataProvider.Identities.Any(identity => identity.Class == enumFasdInformationClass.Computer) is false)
+                    {
+                        LogEntry("Coudldn't acutalize data. There was no information class of type computer found.", LogLevels.Error);
+                        return output;
+                    }
+
+                    if (dataProvider.NamedParameterEntries.TryGetValue("AgentDeviceId", out var agentDeviceIdParameter) is false || int.TryParse(agentDeviceIdParameter.GetValue(), out int agentDeviceId) is false)
+                    {
+                        LogEntry("Coudldn't acutalize data. There was no valid AgentDeviceId found.", LogLevels.Error);
+                        return output;
+                    }
+
+                    int? agentUserId = null;
+                    if (dataProvider.Identities.Any(identity => identity.Class == enumFasdInformationClass.User))
+                        if (dataProvider.NamedParameterEntries.TryGetValue("AgentUserId", out var agentUserIdParameter))
+                            if (int.TryParse(agentUserIdParameter.GetValue(), out int tempAgentUserId))
+                                agentUserId = tempAgentUserId;
+
+                    var actualizeId = await cFasdCockpitCommunicationBase.Instance.ActualizeAgentData(agentDeviceId, agentUserId);
+
+                    if (actualizeId == Guid.Empty)
+                        return enumActualizeStatus.failed;
+
+                    enumFasdInformationClass informationClass = agentUserId != null ? enumFasdInformationClass.User : enumFasdInformationClass.Computer;
+                    int pollCount = 0;
+
+                    while (output == enumActualizeStatus.unknown)
+                    {
+                        output = await cFasdCockpitCommunicationBase.Instance.GetActualizeAgentDataStatus(actualizeId, informationClass);
+
+                        if (output == enumActualizeStatus.unknown)
+                        {
+                            pollCount++;
+                            if (pollCount >= maxPollCount)
+                                return output;
+
+                            await Task.Delay(refreshDelayInMilliseconds);
+                        }
+                    }
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+
+                return output;
+            }
+
+            private void UpdateLatestValues(cF4SDHealthCardRawData newRawData)
+            {
+                try
+                {
+                    if (newRawData is null)
+                        return;
+
+                    foreach (var tableName in newRawData.Tables.Keys)
+                    {
+                        try
+                        {
+                            if (HealthCardRawData.Tables.TryGetValue(tableName, out var oldTable) == false)
+                                continue;
+
+                            if (newRawData.Tables.TryGetValue(tableName, out var newTable) == false)
+                                continue;
+
+                            foreach (var oldColumn in oldTable.Columns)
+                            {
+                                try
+                                {
+                                    if (newTable.Columns.TryGetValue(oldColumn.Key, out var newTableColumn) == false)
+                                        continue;
+
+                                    if (newTable.TableType != eDataHistoryTableType.HistoryEvents)
+                                    {
+                                        if (newTableColumn.Values is null || newTableColumn.Values?.Count <= 0)
+                                            continue;
+                                        if (oldColumn.Value?.Values is null || oldColumn.Value.Values.Count <= 0)
+                                            continue;
+
+                                        oldColumn.Value.Values[0] = newTableColumn.Values[0];
+                                    }
+                                    else
+                                        oldColumn.Value.Values = newTableColumn.Values;
+
+                                }
+                                catch (Exception E)
+                                {
+                                    LogException(E);
+                                }
+                            }
+                        }
+                        catch (Exception E)
+                        {
+                            LogException(E);
+                        }
+                    }
+
+                    SelectedHealthCard.DoComputations(HealthCardRawData);
+                    LogEntry("DataChanged - Update Latest Values finished.");
+                    DataChanged?.Invoke(this, EventArgs.Empty);
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+            }
+
+            private bool CheckUpdatedTable(KeyValuePair<string, cF4SDHealthCardRawData.cHealthCardTable> table, cF4SDHealthCardRawData updatedHealthCardRawData)
+            {
+                if (!(updatedHealthCardRawData?.Tables?.ContainsKey(table.Key) is true))
+                    return false;
+
+                var _res = WasTableUpdated(table.Value, updatedHealthCardRawData.Tables[table.Key]);
+                return _res;
+            }
+
+            private async Task ContinueHealthCardDataLoadingAsync()
+            {
+
+                var CM = MethodBase.GetCurrentMethod();
+                LogMethodBegin(CM);
+                try
+                {
+                    var IsDataIncomplete = true;
+                    do
+                    {
+                        try
+                        {
+                            var updatedHealthCardRawData = await cFasdCockpitCommunicationBase.Instance.GetHealthCardData(HealthCardRawData.Id);
+
+                            lock (HealthCardRawData)
+                            {
+
+                                var incompleteRawTables = HealthCardRawData.Tables.Where(table => table.Value.IsIncomplete
+                                                        && table.Key.StartsWith("Computation_") == false)
+                                                  .ToDictionary(table => table.Key, table => table.Value);
+
+                                if (updatedHealthCardRawData is null)
+                                {
+                                    var _msg = new List<string>
+                                {
+                                    $"Couldn't recieve complete healthcard raw data with id {HealthCardRawData?.Id}.",
+                                    " Incomplete health cards:"
+                                };
+
+                                    foreach (var incompleteTable in HealthCardRawData.Tables.Where(table => table.Value.IsIncomplete))
+                                    {
+                                        _msg.Add($"  {incompleteTable.Value.Name}");
+                                        foreach (var incompleteColumn in incompleteTable.Value.Columns.Values.Where(column => column.IsIncomplete))
+                                        {
+                                            incompleteColumn.IsIncomplete = false;
+                                        }
+
+                                        incompleteTable.Value.IsIncomplete = false;
+                                    }
+
+                                    cLogManager.DefaultLogger.LogList(LogLevels.Error, _msg);
+
+                                    SelectedHealthCard.DoComputations(HealthCardRawData);
+                                    LogEntry("DataChanged - Couldn't complete healthcard raw data.");
+                                    DataChanged?.Invoke(this, EventArgs.Empty);
+                                    break;
+                                }
+
+                                var rawTablesToUpdate = incompleteRawTables.Where(table => CheckUpdatedTable(table, updatedHealthCardRawData)).ToDictionary(table => table.Key, table => table.Value);
+
+                                foreach (var oldTable in rawTablesToUpdate)
+                                {
+                                    if (oldTable.Key.ToLowerInvariant() == "nxt-user")
+                                    {
+
+                                    }
+
+
+                                    var newTable = updatedHealthCardRawData.Tables[oldTable.Key];
+                                    var oldTableValues = HealthCardRawData.Tables[oldTable.Key];
+
+                                    cF4SDHealthCardRawData.cHealthCardTable mergedTable = oldTableValues;
+
+                                    foreach (var newTableColumnKeys in newTable.Columns.Keys)
+                                    {
+                                        if (mergedTable.Columns.ContainsKey(newTableColumnKeys) == false)
+                                            mergedTable.Columns[newTableColumnKeys] = new cF4SDHealthCardRawData.cHealthCardTableColumn();
+
+                                        int mergedTableColumnValueCount = mergedTable.Columns[newTableColumnKeys].Values.Count;
+                                        int mergedTableColumnLength = Math.Max(mergedTable.StartingIndex + mergedTableColumnValueCount, newTable.StartingIndex + newTable.Columns[newTableColumnKeys].Values.Count); //mergedTable.Columns[newTableColumnKeys].Values.Count + newTable.Columns.Count;
+                                        object[] mergedTableColumnValues = new object[mergedTableColumnLength];
+
+                                        for (int i = mergedTable.StartingIndex; i < mergedTable.StartingIndex + mergedTableColumnValueCount; i++)
+                                        {
+                                            mergedTableColumnValues[i] = mergedTable.Columns[newTableColumnKeys].Values[i - mergedTable.StartingIndex];
+                                        }
+
+                                        for (int i = newTable.StartingIndex; i < newTable.StartingIndex + newTable.Columns[newTableColumnKeys].Values.Count; i++)
+                                        {
+                                            mergedTableColumnValues[i] = newTable.Columns[newTableColumnKeys].Values[i - newTable.StartingIndex];
+                                        }
+
+                                        int newStartingIndex = Math.Min(mergedTable.StartingIndex, newTable.StartingIndex);
+                                        mergedTable.Columns[newTableColumnKeys].Values = mergedTableColumnValues.Skip(newStartingIndex).ToList();
+                                        mergedTable.Columns[newTableColumnKeys].IsIncomplete = newTable.Columns[newTableColumnKeys].IsIncomplete;
+                                        mergedTable.StartingIndex = newStartingIndex;
+                                        mergedTable.IsIncomplete = newTable.IsIncomplete;
+                                    }
+
+                                    HealthCardRawData.Tables[oldTable.Key] = mergedTable;
+                                }
+
+                                IsDataIncomplete = HealthCardRawData.Tables.Where(table => table.Key.StartsWith("Computation_") == false)
+                                                         .Any(table => table.Value.IsIncomplete);
+
+                                if (rawTablesToUpdate?.Count > 0)
+                                {
+                                    SelectedHealthCard.DoComputations(HealthCardRawData);
+                                    LogEntry($"DataChanged - {rawTablesToUpdate.Count} Tables where updated with last GetHealthcardData-Request.");
+                                    DataChanged?.Invoke(this, EventArgs.Empty);
+                                }
+                            }
+                        }
+                        catch (Exception E)
+                        {
+                            LogException(E);
+                        }
+                    } while (IsDataIncomplete);
+
+                    DataFullyLoaded?.Invoke(this, new EventArgs());
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+                finally
+                {
+                    LoadingRawDataCriticalSection.Leave();
+                    LogMethodEnd(CM);
+                }
+            }
+
+            private static class LoadingRawDataCriticalSection
+            {
+                private readonly static SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+
+                public static async Task EnterAsync()
+                {
+                    await _semaphore.WaitAsync();
+                }
+
+                public static void Leave()
+                {
+                    _semaphore.Release();
+                }
+            }
+
+        }
+
+        public class cHealthCardCustomizableSectionHelper : cHealthCardStateSubHelper
+        {
+            public List<cContainerData> GetContainerDataFromConfig(cHealthCardStateContainer containerConfig)
+            {
+                List<cContainerData> output = new List<cContainerData>();
+                try
+                {
+                    if (containerConfig is null)
+                        return null;
+
+                    List<IContainerHelperClass> containerHelpers = new List<IContainerHelperClass>();
+
+                    foreach (var stateContainerElementConfig in containerConfig.StateContainerElements)
+                    {
+                        var containerHelper = GetContainerHelperFromConfigElement(stateContainerElementConfig);
+                        containerHelpers.Add(containerHelper);
+                    }
+
+                    if (containerHelpers?.Count <= 0)
+                        return null;
+
+                    int maxValueCountOfContainerHelpers = containerHelpers.Max(helper => helper.MaxValueCount);
+
+                    for (int i = 0; i < maxValueCountOfContainerHelpers; i++)
+                    {
+                        var containerToAdd = new cContainerData() { IsMaximizable = containerConfig.IsMaximizable, IsAddable = containerConfig.IsAddable, IsDeletable = containerConfig.IsDeletable };
+
+                        bool shouldSkipContainer = false;
+                        foreach (var containerHelper in containerHelpers)
+                        {
+                            var containerValue = GetContainerDataAtIndexFromHelper(containerHelper, i);
+                            containerToAdd.Add(containerValue);
+
+                            if (containerHelper.IsValueRequired && containerValue.HasValue is false)
+                                shouldSkipContainer = true;
+                        }
+
+                        if (shouldSkipContainer)
+                            continue;
+
+                        output.Add(containerToAdd);
+                    }
                 }
                 catch (Exception E)
                 {
@@ -2603,23 +2233,44 @@ namespace FasdDesktopUi.Basics.Helper
                 return output;
             }
 
-            public async Task<cDetailsPageData> GetDataAsync()
+            internal cHealthCardCustomizableSectionHelper(cHealthCardDataHelper parent) : base(parent) { }
+
+            internal List<cContainerCollectionData> GetContainerCollectionData()
             {
                 var CM = MethodBase.GetCurrentMethod();
                 LogMethodBegin(CM);
 
-                cDetailsPageData output = new cDetailsPageData();
+                var output = new List<cContainerCollectionData>();
+
                 try
                 {
-                    if (parent.SelectedHealthCard == null)
+                    var customizableSectionConfig = SelectedHealthCard.CustomizableSection;
+
+                    if (customizableSectionConfig is null)
                         return output;
 
-                    output.DataProvider = dataProvider;
-                    output.HeadingData = await parent.GetHeadingDataAsync();
-                    output.WidgetData = GetWidgetsData();
-                    output.DataHistoryList = parent.HistoryData.GetData();
-                    output.DataContainerCollectionList = parent.GetContainerCollectionData();
-                    output.MenuBarData = parent.GetMenuBarData();
+                    foreach (var containerConfigList in customizableSectionConfig.ContainerList)
+                    {
+                        try
+                        {
+                            if (containerConfigList is null)
+                                continue;
+
+                            var containerCollectionToAdd = new cContainerCollectionData() { ColumnSpan = containerConfigList.ColumnSpan };
+
+                            foreach (var containerConfig in containerConfigList.StateContainers)
+                            {
+                                var containerValuesToAdd = GetContainerDataFromConfig(containerConfig);
+                                containerCollectionToAdd.AddRange(containerValuesToAdd);
+                            }
+
+                            output.Add(containerCollectionToAdd);
+                        }
+                        catch (Exception E)
+                        {
+                            LogException(E);
+                        }
+                    }
                 }
                 catch (Exception E)
                 {
@@ -2633,21 +2284,374 @@ namespace FasdDesktopUi.Basics.Helper
                 return output;
             }
 
-        }
-    }
+            private IContainerData GetContainerDataAtIndexFromHelper(IContainerHelperClass containerHelper, int index = 0)
+            {
+                IContainerData output = null;
 
-    public static class LoadingRawDataCriticalSection
-    {
-        private readonly static SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+                try
+                {
+                    switch (containerHelper)
+                    {
+                        case cContainerValueHelper containerValue:
+                            {
+                                string displayValue = string.Empty;
+                                cEditableValueInformationBase editableValueInformation = containerValue.EditableValueInformation;
+
+                                if (containerValue.RawValues.Count > index)
+                                {
+                                    displayValue = cUtility.RawValueFormatter.GetDisplayValue(containerValue.RawValues[index], containerValue.DisplayType);
+
+                                    if (editableValueInformation != null)
+                                        editableValueInformation.CurrentValue = containerValue.RawValues[index];
+                                }
+
+                                string maximizeValue = string.Empty;
+                                if (containerValue.RawMaximizeValues.Count > index)
+                                    maximizeValue = cUtility.RawValueFormatter.GetDisplayValue(containerValue.RawMaximizeValues[index], containerValue.DisplayType);
+
+                                output = new cContainerValue()
+                                {
+                                    DisplayValue = displayValue,
+                                    MaximizeValue = maximizeValue,
+                                    FontSize = containerValue.FontSize,
+                                    FontWeight = containerValue.FontWeight,
+                                    Description = containerValue.Description,
+                                    IsEditOnly = containerValue.IsEditOnly,
+                                    EditableValueInformation = editableValueInformation
+                                };
+
+                                break;
+                            }
+                        case cContainerIconHelper containerIcon:
+                            {
+                                output = new cContainerIcon(enumInternIcons.none);
+                                if (containerIcon.Icons.Count > index)
+                                    output = containerIcon.Icons[index];
+                                break;
+                            }
+                        case cContainerStackPanelHelper containerStackPanel:
+                            {
+                                var outputStackPanelData = new List<IContainerData>();
+
+                                foreach (var stackPanelData in containerStackPanel.StackPanelHelperData)
+                                {
+                                    try
+                                    {
+                                        var dataToAdd = GetContainerDataAtIndexFromHelper(stackPanelData, index);
+                                        outputStackPanelData.Add(dataToAdd);
+                                    }
+                                    catch (Exception E)
+                                    {
+                                        LogException(E);
+                                    }
+                                }
+
+                                output = new cContainerStackPanel()
+                                {
+                                    StackPanelData = outputStackPanelData,
+                                    Orientation = containerStackPanel.Orientation
+                                };
+
+                                break;
+                            }
+                        case cContainerContentHelper containerContent:
+                            {
+                                var outputContentData = GetContainerDataAtIndexFromHelper(containerContent.Content, index);
+                                output = new cContainerPrimaryContent() { Value = outputContentData };
+                                break;
+                            }
+                    }
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+
+                return output;
+            }
+
+            private FontWeight GetFontWeightFromConfigFontWeight(enumFontWeights configFontWeight)
+            {
+                var output = FontWeights.Normal;
+                try
+                {
+                    switch (configFontWeight)
+                    {
+                        case enumFontWeights.Thin:
+                            output = FontWeights.Thin;
+                            break;
+                        case enumFontWeights.ExtraLight:
+                            output = FontWeights.ExtraLight;
+                            break;
+                        case enumFontWeights.UltraLight:
+                            output = FontWeights.UltraLight;
+                            break;
+                        case enumFontWeights.Light:
+                            output = FontWeights.Light;
+                            break;
+                        case enumFontWeights.Normal:
+                            output = FontWeights.Normal;
+                            break;
+                        case enumFontWeights.Regular:
+                            output = FontWeights.Regular;
+                            break;
+                        case enumFontWeights.Medium:
+                            output = FontWeights.Medium;
+                            break;
+                        case enumFontWeights.DemiBold:
+                            output = FontWeights.DemiBold;
+                            break;
+                        case enumFontWeights.SemiBold:
+                            output = FontWeights.SemiBold;
+                            break;
+                        case enumFontWeights.Bold:
+                            output = FontWeights.Bold;
+                            break;
+                        case enumFontWeights.ExtraBold:
+                            output = FontWeights.ExtraBold;
+                            break;
+                        case enumFontWeights.UltraBold:
+                            output = FontWeights.UltraBold;
+                            break;
+                        case enumFontWeights.Black:
+                            output = FontWeights.Black;
+                            break;
+                        case enumFontWeights.Heavy:
+                            output = FontWeights.Heavy;
+                            break;
+                        case enumFontWeights.ExtraBlack:
+                            output = FontWeights.ExtraBlack;
+                            break;
+                        case enumFontWeights.UltraBlack:
+                            output = FontWeights.UltraBlack;
+                            break;
+                    }
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+                return output;
+            }
+
+            private IContainerData GetPlaceHolderContainerDataFromConfigElement(IStateContainerElement stateContainerElementConfig)
+            {
+                IContainerData output = null;
+
+                try
+                {
+                    switch (stateContainerElementConfig)
+                    {
+                        case cHealthCardStateStylable stylableStateConfig:
+                            {
+                                var fontWeight = GetFontWeightFromConfigFontWeight(stylableStateConfig.FontWeight);
+
+                                output = new cContainerValue()
+                                {
+                                    DisplayValue = stylableStateConfig.Names.GetValue(),
+                                    FontSize = stylableStateConfig.FontSize,
+                                    FontWeight = fontWeight,
+                                    Description = parent.GetTitleColumnOfHealthCardState(stylableStateConfig).ContentDescription,
+                                };
+
+                                break;
+                            }
+                        case cHealthCardStateIconTranslation iconTranslationStateConfig:
+                            {
+                                output = new cContainerIcon() { IconType = enumIconType.intern, IconName = "f4sd" };
+                                break;
+                            }
+                        case cHealthCardStateStackPanel stackPanelConfig:
+                            {
+                                var orientation = Orientation.Horizontal;
+                                Enum.TryParse(stackPanelConfig.Orientation.ToString(), out orientation);
+
+                                var stackPanelData = new List<IContainerData>();
+                                foreach (var stackPanelState in stackPanelConfig.Children)
+                                {
+                                    var childData = GetPlaceHolderContainerDataFromConfigElement(stackPanelState);
+                                    stackPanelData.Add(childData);
+                                }
+
+                                output = new cContainerStackPanel() { Orientation = orientation, StackPanelData = stackPanelData };
+                                break;
+                            }
+                        case cHealthCardStateContainerContent containerContentConfig:
+                            {
+                                var content = GetPlaceHolderContainerDataFromConfigElement(containerContentConfig.Content);
+                                output = new cContainerPrimaryContent() { Value = content };
+                                break;
+                            }
+                    }
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+
+                return output;
+            }
+
+            private IContainerHelperClass GetContainerHelperFromConfigElement(IStateContainerElement stateContainerElementConfig)
+            {
+                IContainerHelperClass output = null;
+
+                try
+                {
+                    switch (stateContainerElementConfig)
+                    {
+                        case cHealthCardStateStylable stylableStateConfig:
+                            {
+                                var values = parent.GetStateValues(stylableStateConfig.DatabaseInfo, false);
+                                var display = stylableStateConfig.DisplayType;
+                                var maximingValues = parent.GetStateValues(stylableStateConfig.MaximizedDatabaseInfo, false);
+                                var fontWeight = GetFontWeightFromConfigFontWeight(stylableStateConfig.FontWeight);
+
+                                cEditableValueInformationBase editableInformation = null;
+                                if (stylableStateConfig.EditInfo != null)
+                                {
+                                    switch (stylableStateConfig.EditInfo)
+                                    {
+                                        case cStateEditableSelection edtiableSelectionInfo:
+                                            var editSelectionValues = parent.GetEditInformationSelectionValues(stylableStateConfig);
+                                            editableInformation = new cEditValueInformationSelection() { DatabaseInfo = stylableStateConfig.DatabaseInfo, SelectionValues = editSelectionValues, Description = stylableStateConfig.Names.GetValue() };
+                                            break;
+                                        case cStateEditableText editableTextInfo:
+                                            editableInformation = new cEditValueInformationText() { DatabaseInfo = stylableStateConfig.DatabaseInfo, Description = stylableStateConfig.Names.GetValue() };
+                                            break;
+                                        default:
+                                            break;
+
+                                    }
+                                }
+
+                                output = new cContainerValueHelper()
+                                {
+                                    RawValues = values,
+                                    RawMaximizeValues = maximingValues,
+                                    DisplayType = cUtility.GetRawValueType(display),
+                                    Description = parent.GetTitleColumnOfHealthCardState(stylableStateConfig).ContentDescription,
+                                    FontSize = stylableStateConfig.FontSize,
+                                    FontWeight = fontWeight,
+                                    EditableValueInformation = editableInformation,
+                                    IsValueRequired = stateContainerElementConfig.IsRequired
+                                };
+                                break;
+                            }
+                        case cHealthCardStateIconTranslation iconTranslationStateConfig:
+                            {
+                                var rawValues = parent.GetStateValues(iconTranslationStateConfig.DatabaseInfo, false);
+                                var translation = cF4SDHealthCardConfig.GetTranslationsWithName(iconTranslationStateConfig, iconTranslationStateConfig.Translation);
+                                var icons = new List<cContainerIcon>();
+
+                                foreach (var rawValue in rawValues)
+                                {
+                                    var iconName = "none";
+                                    enumIconType iconType = enumIconType.intern;
+                                    enumHighlightColor highlightColor = enumHighlightColor.none;
+
+                                    if (translation is cHealthCardIconTranslator iconTranslation)
+                                    {
+                                        var selectedTranslation = iconTranslation.IconTranslations.FirstOrDefault(tempTranslation => tempTranslation.Values.Contains(rawValue)) ?? iconTranslation.DefaultIconTranslation;
+                                        if (selectedTranslation != null)
+                                        {
+                                            iconName = selectedTranslation.Icon.Name;
+                                            iconType = selectedTranslation.Icon.IconType;
+
+                                            switch (selectedTranslation.StateLevel)
+                                            {
+                                                case enumHealthCardStateLevel.Ok:
+                                                    highlightColor = enumHighlightColor.green;
+                                                    break;
+                                                case enumHealthCardStateLevel.Warning:
+                                                    highlightColor = enumHighlightColor.orange;
+                                                    break;
+                                                case enumHealthCardStateLevel.Error:
+                                                    highlightColor = enumHighlightColor.red;
+                                                    break;
+                                                case enumHealthCardStateLevel.Info:
+                                                    highlightColor = enumHighlightColor.blue;
+                                                    break;
+                                            }
+
+                                            string toolTipText = selectedTranslation.Descriptions.GetValue(null, string.Empty);
+
+                                            icons.Add(new cContainerIcon() { IconName = iconName, IconType = iconType, HighlightColor = highlightColor, ToolTipText = toolTipText });
+                                        }
+                                    }
+                                }
+
+                                output = new cContainerIconHelper() { Icons = icons, IsValueRequired = stateContainerElementConfig.IsRequired };
+                                break;
+                            }
+                        case cHealthCardStateStackPanel stackPanelConfig:
+                            {
+                                var orientation = Orientation.Horizontal;
+                                Enum.TryParse(stackPanelConfig.Orientation.ToString(), out orientation);
+
+                                var stackPanelData = new List<IContainerHelperClass>();
+                                foreach (var stackPanelState in stackPanelConfig.Children)
+                                {
+                                    var childData = GetContainerHelperFromConfigElement(stackPanelState);
+                                    stackPanelData.Add(childData);
+                                }
+
+                                output = new cContainerStackPanelHelper() { Orientation = orientation, StackPanelHelperData = stackPanelData, IsValueRequired = stateContainerElementConfig.IsRequired };
+                                break;
+                            }
+                        case cHealthCardStateContainerContent containerContentConfig:
+                            {
+                                var content = GetContainerHelperFromConfigElement(containerContentConfig.Content);
+                                output = new cContainerContentHelper() { Content = content, IsValueRequired = stateContainerElementConfig.IsRequired || content.IsValueRequired };
+                                break;
+                            }
+                        case cHealthCardStateEditable editableStateConfig:
+                            {
+                                cEditableValueInformationBase editableInformation = null;
+                                if (editableStateConfig.EditInfo is null)
+                                    break;
+
+                                switch (editableStateConfig.EditInfo)
+                                {
+                                    case cStateEditableSelection edtiableSelectionInfo:
+                                        var editSelectionValues = parent.GetEditInformationSelectionValues(editableStateConfig);
+                                        editableInformation = new cEditValueInformationSelection() { DatabaseInfo = editableStateConfig.DatabaseInfo, SelectionValues = editSelectionValues, Description = editableStateConfig.Names.GetValue() };
+                                        break;
+                                    case cStateEditableText editableTextInfo:
+                                        editableInformation = new cEditValueInformationText() { DatabaseInfo = editableStateConfig.DatabaseInfo, Description = editableStateConfig.Names.GetValue() };
+                                        break;
+                                    default:
+                                        break;
+
+                                }
+
+                                output = new cContainerValueHelper()
+                                {
+                                    RawValues = new List<object>() { editableStateConfig.Names.GetValue() },
+                                    IsEditOnly = true,
+                                    EditableValueInformation = editableInformation,
+                                    IsValueRequired = stateContainerElementConfig.IsRequired
+                                };
+                                break;
+                            }
+                    }
+
+
+                }
+                catch (Exception E)
+                {
+                    LogException(E);
+                }
+
+                return output;
+            }
 
-        public static async Task EnterAsync()
-        {
-            await _semaphore.WaitAsync();
         }
 
-        public static void Leave()
+        private class cStateValueInfo
         {
-            _semaphore.Release();
+            public string Content { get; set; }
+            public enumHighlightColor HighlightColor { get; set; }
         }
     }
 }
diff --git a/FasdDesktopUi/Basics/Models/ConnectionStatusHelper.cs b/FasdDesktopUi/Basics/Models/ConnectionStatusHelper.cs
index d28c2fb..e076461 100644
--- a/FasdDesktopUi/Basics/Models/ConnectionStatusHelper.cs
+++ b/FasdDesktopUi/Basics/Models/ConnectionStatusHelper.cs
@@ -229,7 +229,10 @@ namespace FasdDesktopUi.Basics.Models
                         {
                             Dispatcher.CurrentDispatcher.Invoke(() => splashScreen?.SetStatusText(cMultiLanguageSupport.GetItem("StartUp.SplashScreen.AuthenticateUser")));
                             ApiConnectionStatus = enumOnlineStatus.unauthorized;
-                            const string cockpitUserRole = "Cockpit.User";
+                            const string cockpitUserRole = "Cockpit.User";
+#if isNewFeature
+                            const string cockpitTicketAgentRole = "Cockpit.TicketAgent";
+#endif
                             userInfo = await cFasdCockpitCommunicationBase.Instance.WinLogon();
                             lock (cFasdCockpitCommunicationBase.CockpitUserInfoLock)
                             {
@@ -244,6 +247,10 @@ namespace FasdDesktopUi.Basics.Models
                             {
                                 await Task.Run(async () => await cFasdCockpitConfig.Instance.InstantiateAnalyticsAsync(cFasdCockpitConfig.SessionId));
                                 ApiConnectionStatus = enumOnlineStatus.online;
+#if isNewFeature
+                                if (userInfo.Roles.Contains(cockpitTicketAgentRole))
+                                    cCockpitConfiguration.Instance.ticketSupport.EditTicket = true;
+#endif
                             }
                         }
                     }
diff --git a/FasdDesktopUi/Basics/Models/DataHistoryValueModel.cs b/FasdDesktopUi/Basics/Models/DataHistoryValueModel.cs
index c9e4b3e..ea49f2e 100644
--- a/FasdDesktopUi/Basics/Models/DataHistoryValueModel.cs
+++ b/FasdDesktopUi/Basics/Models/DataHistoryValueModel.cs
@@ -22,6 +22,9 @@ namespace FasdDesktopUi.Basics.Models
         [JsonConverter(typeof(StringEnumConverter))]
         public enumHighlightColor? HighlightColor { get; set; }
 
+        [JsonIgnore]
+        public enumHistoryTitleType? PresentationStyle { get; set; } = enumHistoryTitleType.none;
+
         [JsonIgnore]
         public cUiActionBase UiAction { get; set; }
 
diff --git a/FasdDesktopUi/Basics/Services/ProtocollService/QuickActionProtocollEntry.cs b/FasdDesktopUi/Basics/Services/ProtocollService/QuickActionProtocollEntry.cs
index 0c1bbc7..211bb1f 100644
--- a/FasdDesktopUi/Basics/Services/ProtocollService/QuickActionProtocollEntry.cs
+++ b/FasdDesktopUi/Basics/Services/ProtocollService/QuickActionProtocollEntry.cs
@@ -35,8 +35,7 @@ namespace FasdDesktopUi.Basics.Services.ProtocollService
                 quickActionCopyData.Name = quickActionDefinition.Names.GetValue();
                 quickActionCopyData.ExecutionTime = DateTime.UtcNow;
 
-                if (dataProvider.HealthCardDataHelper.HeadingData.TryGetValue(enumFasdInformationClass.Computer, out var computerHeadingData))
-                    quickActionCopyData.AffectedDeviceName = computerHeadingData.HeadingText;
+                quickActionCopyData.AffectedDeviceName = dataProvider.HealthCardDataHelper.GetInformationObjectHeadingName(enumFasdInformationClass.Computer);
 
                 quickActionCopyData.WasRunningOnAffectedDevice = wasRunningOnAffectedDevice;
                 quickActionCopyData.QuickActionOutput = quickActionOutput;
diff --git a/FasdDesktopUi/Basics/SupportCaseDataProvider.cs b/FasdDesktopUi/Basics/SupportCaseDataProvider.cs
index 87f0abf..8702a06 100644
--- a/FasdDesktopUi/Basics/SupportCaseDataProvider.cs
+++ b/FasdDesktopUi/Basics/SupportCaseDataProvider.cs
@@ -432,7 +432,7 @@ namespace FasdDesktopUi.Basics
         {
             try
             {
-                var couldGetHealthCard = HealthCardDataHelper.TryGetHealthcard(requiredInformationClasses);
+                var couldGetHealthCard = HealthCardDataHelper.TrySetSelectedHealthcard(requiredInformationClasses);
 
                 if (!couldGetHealthCard)
                 {
@@ -452,7 +452,7 @@ namespace FasdDesktopUi.Basics
                     }
                 }
 
-                var isOk = await HealthCardDataHelper.GetHealthCardRawDataAsync(new cF4sdHealthCardRawDataRequest()
+                var isOk = await HealthCardDataHelper.LoadingHelper.GetHealthCardRawDataAsync(new cF4sdHealthCardRawDataRequest()
                 {
                     Identities = Identities,
                     Tables = requiredTables.ToList(),
@@ -460,7 +460,7 @@ namespace FasdDesktopUi.Basics
                 });
 
                 if (isNewCase)
-                    HealthCardDataHelper.LastDataRequest = DateTime.Now;
+                    HealthCardDataHelper.LoadingHelper.LastDataRequest = DateTime.Now;
 
                 if (isOk == false)
                 {
diff --git a/FasdDesktopUi/Basics/UiActions/ShowCustomDialog.cs b/FasdDesktopUi/Basics/UiActions/ShowCustomDialog.cs
index a9b1f97..784b13e 100644
--- a/FasdDesktopUi/Basics/UiActions/ShowCustomDialog.cs
+++ b/FasdDesktopUi/Basics/UiActions/ShowCustomDialog.cs
@@ -39,7 +39,7 @@ namespace FasdDesktopUi.Basics.UiActions
                     return null;
 
                 if (cF4SDCustomDialogConfig.Instance.CustomDialogContainers.TryGetValue(name, out var containerConfig))
-                    output = dataProvider.HealthCardDataHelper.GetContainerDataFromConfig(containerConfig);
+                    output = dataProvider.HealthCardDataHelper.CustomizableSectionHelper.GetContainerDataFromConfig(containerConfig);
             }
             catch (Exception E)
             {
diff --git a/FasdDesktopUi/Basics/UiActions/ShowDetailedDataAction.cs b/FasdDesktopUi/Basics/UiActions/ShowDetailedDataAction.cs
index ecdb4ec..643c0cc 100644
--- a/FasdDesktopUi/Basics/UiActions/ShowDetailedDataAction.cs
+++ b/FasdDesktopUi/Basics/UiActions/ShowDetailedDataAction.cs
@@ -55,7 +55,7 @@ namespace FasdDesktopUi.Basics.UiActions
                     return false;
 
                 DataProvider = dataProvider;
-                DataProvider.HealthCardDataHelper.DataRefreshed += (s, e) => CachedDetails.Clear();
+                DataProvider.HealthCardDataHelper.LoadingHelper.DataRefreshed += (s, e) => CachedDetails.Clear();
 
                 Mouse.OverrideCursor = Cursors.Wait;
 
diff --git a/FasdDesktopUi/Basics/UserControls/ComboBoxPageable.xaml b/FasdDesktopUi/Basics/UserControls/ComboBoxPageable.xaml
index 55280b7..560571a 100644
--- a/FasdDesktopUi/Basics/UserControls/ComboBoxPageable.xaml
+++ b/FasdDesktopUi/Basics/UserControls/ComboBoxPageable.xaml
@@ -204,7 +204,7 @@
                   DropDownClosed="ComboBoxControl_DropDownClosed"
                   Background="{Binding ElementName=ComboBoxPagableUc, Path=ComboBoxBackground}"
                   BorderBrush="{Binding ElementName=ComboBoxPagableUc, Path=BorderBrush}"
-                  BorderThickness="0"
+                  BorderThickness="{Binding ElementName=ComboBoxPagableUc, Path=BorderThickness}"
                   ItemsSource="{Binding ElementName=ComboBoxPagableUc, Path=ItemData}"
                   SelectedItem="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:ComboBoxPageable}}, Path=SelectedItem, Mode=TwoWay}"
                   DisplayMemberPath="Key"
diff --git a/FasdDesktopUi/Basics/UserControls/DataCanvas/DataCanvas.xaml.cs b/FasdDesktopUi/Basics/UserControls/DataCanvas/DataCanvas.xaml.cs
index a46ee3e..38cfd42 100644
--- a/FasdDesktopUi/Basics/UserControls/DataCanvas/DataCanvas.xaml.cs
+++ b/FasdDesktopUi/Basics/UserControls/DataCanvas/DataCanvas.xaml.cs
@@ -33,8 +33,8 @@ namespace FasdDesktopUi.Basics.UserControls
                 if (DataCanvasData.GetDetailedDataAsync != null)
                 {
                     if (dataProvider != null)
-                        dataProvider.HealthCardDataHelper.DataRefreshed -= HealthCardDataHelper_DataRefreshed;
-                    value.HealthCardDataHelper.DataRefreshed += HealthCardDataHelper_DataRefreshed;
+                        dataProvider.HealthCardDataHelper.LoadingHelper.DataRefreshed -= HealthCardDataHelper_DataRefreshed;
+                    value.HealthCardDataHelper.LoadingHelper.DataRefreshed += HealthCardDataHelper_DataRefreshed;
                 }
 
                 dataProvider = value;
@@ -57,10 +57,10 @@ namespace FasdDesktopUi.Basics.UserControls
                 if (_me.dataProvider != null)
                 {
                     if (oldData.GetDetailedDataAsync != null)
-                        _me.dataProvider.HealthCardDataHelper.DataRefreshed -= _me.HealthCardDataHelper_DataRefreshed;
+                        _me.dataProvider.HealthCardDataHelper.LoadingHelper.DataRefreshed -= _me.HealthCardDataHelper_DataRefreshed;
 
                     if (newData.GetDetailedDataAsync != null)
-                        _me.dataProvider.HealthCardDataHelper.DataRefreshed += _me.HealthCardDataHelper_DataRefreshed;
+                        _me.dataProvider.HealthCardDataHelper.LoadingHelper.DataRefreshed += _me.HealthCardDataHelper_DataRefreshed;
                 }
 
                 _me.QuickActionStatusUc.CancelQuickAction();
diff --git a/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml b/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml
index 90fa1e8..2d94542 100644
--- a/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml
+++ b/FasdDesktopUi/Basics/UserControls/HierarchicalSelectionControl.xaml
@@ -181,7 +181,8 @@
     <Grid>
         <ComboBox x:Name="ComboBoxControl"
                   Background="{Binding ElementName=HierarchySelector, Path=ComboBoxBackground}"
-                  BorderBrush="{Binding ElementName=HierarchySelector, Path=BorderBrush}"
+                  BorderBrush="Transparent"
+                  BorderThickness="0"
                   Foreground="{DynamicResource FontColor.Menu.Categories}"
                   ItemsSource="{Binding VisibleItems, ElementName=HierarchySelector}"
                   DisplayMemberPath="FullPath"
diff --git a/FasdDesktopUi/Basics/UserControls/SearchFilterBar.xaml.cs b/FasdDesktopUi/Basics/UserControls/SearchFilterBar.xaml.cs
index d8db552..f5b5928 100644
--- a/FasdDesktopUi/Basics/UserControls/SearchFilterBar.xaml.cs
+++ b/FasdDesktopUi/Basics/UserControls/SearchFilterBar.xaml.cs
@@ -5,7 +5,6 @@ using FasdDesktopUi.Basics.CustomEvents;
 using FasdDesktopUi.Basics.Models;
 using FasdDesktopUi.Basics.UserControls.AdaptableIcon;
 using FasdDesktopUi.Pages.AdvancedSearchPage;
-using Microsoft.Internal.VisualStudio.PlatformUI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
index 0407f5a..8828185 100644
--- a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
+++ b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
@@ -181,6 +181,7 @@
                                                                 SelectedItem="{Binding SelectedCategory, ElementName=CloseCaseDialogUc, Mode=TwoWay}"
                                                                 ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
                                                                 BorderBrush="Transparent"
+                                                                BorderThickness="0"
                                                                 SearchPlaceholderText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Searchbar.Placeholder}"
                                                                 DropDownOpened="DropDownOpened"
                                                                 DropDownClosed="DropDownClosed"
diff --git a/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml b/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml
index df01848..2a302f8 100644
--- a/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml
+++ b/FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml
@@ -25,7 +25,8 @@
             <local:ComboBoxPageable x:Name="RoleSelectionControl"
                                     SelectedItem="{Binding ElementName=ForwardTicketDialogUc, Path=SelectedRole, Mode=TwoWay}"
                                     ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
-                                    BorderBrush="Transparent" />
+                                    BorderBrush="Transparent"
+                                    BorderThickness="0" />
         </Border>
 
         <TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.ForwardTicket.ResponsiblePerson}"
@@ -38,7 +39,8 @@
             <local:ComboBoxPageable x:Name="PersonSelectionControl"
                                     SelectedItem="{Binding ElementName=ForwardTicketDialogUc, Path=SelectedPerson, Mode=TwoWay}"
                                     ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
-                                    BorderBrush="Transparent" />
+                                    BorderBrush="Transparent"
+                                    BorderThickness="0" />
         </Border>
 
         <TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.ForwardTicket.Comment}"
diff --git a/FasdDesktopUi/Basics/cUtility.cs b/FasdDesktopUi/Basics/cUtility.cs
index 8dd4377..6df7766 100644
--- a/FasdDesktopUi/Basics/cUtility.cs
+++ b/FasdDesktopUi/Basics/cUtility.cs
@@ -386,221 +386,6 @@ namespace FasdDesktopUi.Basics
             return false;
         }
 
-        #region Ascii
-
-        public static string GetQuickActionAsciiString(cQuickActionCopyData copyData, cFasdQuickAction quickActionDefinition)
-        {
-            string output = string.Empty;
-
-            try
-            {
-                output += GetQuickActionAsciiDescriptionString(copyData.Name, copyData.AffectedDeviceName, copyData.WasRunningOnAffectedDevice, copyData.ExecutionTime, copyData.QuickActionOutput?.ResultCode);
-                output += GetQuickActionAsciiErrorString(copyData.QuickActionOutput?.ErrorDescription);
-                output += GetQuickActionAsciiOutputString(copyData.QuickActionOutput, quickActionDefinition);
-                output += GetQuickActionAsciiValueComparisonString(copyData.MeasureValues);
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private static string GetQuickActionAsciiDescriptionString(string quickActionName, string deviceName, bool wasRunningOnAffectedDevice, DateTime executionTime, enumQuickActionSuccess? quickActionStatus)
-        {
-            string output = string.Empty;
-            try
-            {
-                var quickActionStatusString = string.Empty;
-
-                switch (quickActionStatus)
-                {
-                    case null:
-                    case enumQuickActionSuccess.successfull:
-                        quickActionStatusString = cMultiLanguageSupport.GetItem("QuickAction.Copy.RevisionStatus.Successfull");
-                        break;
-                    case enumQuickActionSuccess.error:
-                        quickActionStatusString = cMultiLanguageSupport.GetItem("QuickAction.Copy.RevisionStatus.Error");
-                        break;
-                }
-
-                var rawDescription = wasRunningOnAffectedDevice ? cMultiLanguageSupport.GetItem("QuickAction.Remote.Copy.Description") : cMultiLanguageSupport.GetItem("QuickAction.Local.Copy.Description");
-                output = string.Format(rawDescription, quickActionName, deviceName, executionTime.ToString("g", new CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage)), quickActionStatusString);
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private static string GetQuickActionAsciiErrorString(string errorMessage)
-        {
-            string output = string.Empty;
-            try
-            {
-                if (!string.IsNullOrWhiteSpace(errorMessage))
-                    output = "\n\n" + errorMessage;
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private static string GetQuickActionAsciiOutputString(QuickActionStatusMonitor.cQuickActionOutput quickActionOutput, cFasdQuickAction quickActionDefinition)
-        {
-            string output = string.Empty;
-
-            try
-            {
-                if (!string.IsNullOrWhiteSpace(quickActionOutput?.ErrorDescription))
-                    return output;
-
-
-                switch (quickActionOutput)
-                {
-                    case QuickActionStatusMonitor.cQuickActionOutputSingle singleOutput:
-                        {
-                            if (singleOutput.Value is null)
-                                return output;
-
-                            output += "\n\n";
-                            output += cMultiLanguageSupport.GetItem("QuickAction.Copy.Output") + " ";
-                            output += singleOutput.GetDisplayValue(quickActionDefinition.ColumnOutputFormattings);
-
-                            break;
-                        }
-                    case QuickActionStatusMonitor.cQuickActionOutputList listOutput:
-                        {
-                            output += "\n\n";
-                            output += cMultiLanguageSupport.GetItem("QuickAction.Copy.Output") + "\n";
-
-
-                            foreach (var value in listOutput.Values[0])
-                            {
-                                if (ShouldHideQuickActionOutput(value.Key, quickActionDefinition))
-                                    continue;
-
-                                if (quickActionDefinition.ColumnOutputFormattings?.TryGetValue(value.Key, out var outputFormatting) ?? false)
-                                    output += outputFormatting.Names.GetValue();
-                                else
-                                    output += value.Key;
-
-                                output += " | ";
-                            }
-
-                            for (int i = 0; i < listOutput.Values.Count; i++)
-                            {
-                                output += "\n";
-
-                                for (int j = 0; j < listOutput.Values[i].Count; j++)
-                                {
-                                    string valueKey = listOutput.Values[0][j].Key;
-
-                                    if (ShouldHideQuickActionOutput(valueKey, quickActionDefinition))
-                                        continue;
-
-                                    string displayValue = listOutput.GetDisplayValue(i, j, quickActionDefinition.ColumnOutputFormattings);
-
-                                    if (string.IsNullOrWhiteSpace(displayValue))
-                                        continue;
-
-                                    output += displayValue;
-                                    output += " | ";
-                                }
-                            }
-
-                            break;
-                        }
-                    case QuickActionStatusMonitor.cQuickActionOutputObject objectOutput:
-                        {
-                            output += "\n\n";
-                            output += cMultiLanguageSupport.GetItem("QuickAction.Copy.Output") + "\n";
-
-                            for (int i = 0; i < objectOutput.Values.Count; i++)
-                            {
-                                var value = objectOutput.Values[i];
-
-                                if (ShouldHideQuickActionOutput(value.Key, quickActionDefinition))
-                                    continue;
-
-                                string columnTitle = string.Empty;
-
-                                if (quickActionDefinition.ColumnOutputFormattings?.TryGetValue(value.Key, out var outputFormatting) ?? false)
-                                    columnTitle = outputFormatting.Names.GetValue();
-                                else
-                                    columnTitle = value.Key;
-
-                                if (!string.IsNullOrEmpty(columnTitle))
-                                    output += $"{columnTitle}: ";
-
-                                string displayValue = objectOutput.GetDisplayValue(i, quickActionDefinition.ColumnOutputFormattings);
-                                output += !string.IsNullOrWhiteSpace(displayValue) ? displayValue : null;
-
-                                output += "\n";
-                            }
-
-                            break;
-                        }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private static string GetQuickActionAsciiValueComparisonString(List<QuickActionStatusMonitor.cQuickActionMeasureValue> measureValues)
-        {
-            string output = string.Empty;
-
-            try
-            {
-                if (measureValues is null || measureValues.Count <= 0)
-                    return output;
-
-                output += "\n\n" + cMultiLanguageSupport.GetItem("QuickAction.Copy.Measure");
-
-                RawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
-
-                foreach (var measureValue in measureValues)
-                {
-                    try
-                    {
-                        string value = RawValueFormatter.GetDisplayValue(measureValue.Value, measureValue.Display);
-                        string postValue = RawValueFormatter.GetDisplayValue(measureValue.PostValue, measureValue.Display);
-                        string difference = string.Empty;
-
-                        if (measureValue.Difference != null)
-                            difference = $" (∆ {RawValueFormatter.GetDisplayValue(measureValue.Difference, measureValue.Display)})";
-
-                        output += "\n" + measureValue.Names.GetValue(cF4SDCockpitXmlConfig.Instance.HealthCardConfig.ProtocollLanguage) + ": " + value + " ➜ " + postValue + difference;
-                    }
-                    catch (Exception E)
-                    {
-                        LogException(E);
-                    }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        #endregion
-
-        #region Html
-
         public static string GetHtmlFrame(string Content)
         {
             var strLen1 = (Content.Length + 142).ToString("D10");
@@ -618,229 +403,6 @@ namespace FasdDesktopUi.Basics
             return RetVal;
         }
 
-        public static string GetQuickActionHtmlString(cQuickActionCopyData copyData, cFasdQuickAction quickActionDefinition)
-        {
-            string output = string.Empty;
-
-            try
-            {
-                output += GetQuickActionHtmlDescriptionString(copyData.Name, copyData.AffectedDeviceName, copyData.WasRunningOnAffectedDevice, copyData.ExecutionTime, copyData.QuickActionOutput?.ResultCode);
-                output += GetQuickActionHtmlErrorString(copyData.QuickActionOutput?.ErrorDescription);
-                output += GetQuickActionHtmlOutputString(copyData.QuickActionOutput, quickActionDefinition);
-                output += GetQuickActionHtmlValueComparisonString(copyData.MeasureValues);
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private static string GetQuickActionHtmlDescriptionString(string quickActionName, string deviceName, bool wasRunningOnAffectedDevice, DateTime executionTime, enumQuickActionSuccess? quickActionStatus)
-        {
-            string output = string.Empty;
-            try
-            {
-                var quickActionStatusString = string.Empty;
-
-                switch (quickActionStatus)
-                {
-                    case null:
-                    case enumQuickActionSuccess.successfull:
-                        quickActionStatusString = cMultiLanguageSupport.GetItem("QuickAction.Copy.RevisionStatus.Successfull");
-                        break;
-                    case enumQuickActionSuccess.error:
-                        quickActionStatusString = cMultiLanguageSupport.GetItem("QuickAction.Copy.RevisionStatus.Error");
-                        break;
-                }
-
-                var rawDescription = wasRunningOnAffectedDevice ? cMultiLanguageSupport.GetItem("QuickAction.Remote.Copy.Description.Html") : cMultiLanguageSupport.GetItem("QuickAction.Local.Copy.Description.Html");
-                output = string.Format(rawDescription, quickActionName, deviceName, executionTime.ToString("g", new CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage)), quickActionStatusString);
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        private static string GetQuickActionHtmlErrorString(string errorMessage)
-        {
-            string output = string.Empty;
-            try
-            {
-                if (!string.IsNullOrWhiteSpace(errorMessage))
-                    output = "<br/><p style=\"color:red\">" + errorMessage + "</p>";
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        public static string GetQuickActionHtmlOutputString(QuickActionStatusMonitor.cQuickActionOutput quickActionOutput, cFasdQuickAction quickActionDefinition)
-        {
-            string output = string.Empty;
-
-            try
-            {
-                if (!string.IsNullOrWhiteSpace(quickActionOutput?.ErrorDescription))
-                    return output;
-
-                output += "<br/>";
-
-                switch (quickActionOutput)
-                {
-                    case QuickActionStatusMonitor.cQuickActionOutputSingle singleOutput:
-                        {
-                            if (singleOutput.Value is null)
-                                return output;
-
-                            var displayValue = singleOutput.GetDisplayValue(quickActionDefinition?.ColumnOutputFormattings);
-                            output += "<p>" + cMultiLanguageSupport.GetItem("QuickAction.Copy.Output.Html") + " " + displayValue + "</p>";
-                            break;
-                        }
-                    case QuickActionStatusMonitor.cQuickActionOutputList listOutput:
-                        {
-                            output += "<p>" + cMultiLanguageSupport.GetItem("QuickAction.Copy.Output.Html") + "</p>";
-
-                            output += "<table border=\"1\">";
-                            output += "<tr>";
-
-                            foreach (var value in listOutput.Values[0])
-                            {
-                                if (ShouldHideQuickActionOutput(value.Key, quickActionDefinition))
-                                    continue;
-
-                                string headingValue = value.Key;
-                                if (quickActionDefinition.ColumnOutputFormattings?.TryGetValue(value.Key, out var outputFormatting) ?? false)
-                                    headingValue = outputFormatting.Names.GetValue();
-
-                                output += "<th align=\"left\">";
-                                output += headingValue;
-                                output += "</th>";
-                            }
-
-                            output += "</tr>";
-
-                            for (int i = 0; i < listOutput.Values.Count; i++)
-                            {
-                                output += "<tr>";
-
-                                for (int j = 0; j < listOutput.Values[i].Count; j++)
-                                {
-                                    string valueKey = listOutput.Values[0][j].Key;
-                                    if (ShouldHideQuickActionOutput(valueKey, quickActionDefinition))
-                                        continue;
-
-                                    string displayValue = listOutput.GetDisplayValue(i, j, quickActionDefinition.ColumnOutputFormattings);
-
-                                    if (string.IsNullOrWhiteSpace(displayValue))
-                                        continue;
-
-                                    output += "<td>";
-                                    output += displayValue;
-                                    output += "</td>";
-                                }
-
-                                output += "</tr>";
-                            }
-
-                            output += "</table>";
-                            break;
-                        }
-                    case QuickActionStatusMonitor.cQuickActionOutputObject objectOutput:
-                        {
-                            output += "<p>" + cMultiLanguageSupport.GetItem("QuickAction.Copy.Output.Html") + "</p>";
-
-                            output += "<table border=\"1\">";
-
-                            for (int i = 0; i < objectOutput.Values.Count; i++)
-                            {
-                                var value = objectOutput.Values[i];
-
-                                if (ShouldHideQuickActionOutput(value.Key, quickActionDefinition))
-                                    continue;
-
-                                string headingValue = value.Key;
-                                if (quickActionDefinition.ColumnOutputFormattings?.TryGetValue(value.Key, out var outputFormatting) ?? false)
-                                    headingValue = outputFormatting.Names.GetValue();
-
-                                output += "<tr>";
-                                output += "<td>";
-                                output += headingValue;
-                                output += "</td>";
-
-                                output += "<td>";
-                                string displayValue = objectOutput.GetDisplayValue(i, quickActionDefinition.ColumnOutputFormattings);
-                                output += !string.IsNullOrWhiteSpace(displayValue) ? displayValue : null;
-                                output += "</td>";
-
-                                output += "</tr>";
-                            }
-
-                            output += "</table>";
-                            break;
-                        }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-        public static string GetQuickActionHtmlValueComparisonString(List<QuickActionStatusMonitor.cQuickActionMeasureValue> measureValues)
-        {
-            string output = string.Empty;
-
-            try
-            {
-                if (measureValues is null || measureValues.Count <= 0)
-                    return output;
-
-                output += "<p>" + cMultiLanguageSupport.GetItem("QuickAction.Copy.Measure.Html") + "</p>";
-
-                RawValueFormatter.SetDefaultCulture(new System.Globalization.CultureInfo(cFasdCockpitConfig.Instance.SelectedLanguage));
-
-                foreach (var measureValue in measureValues)
-                {
-                    try
-                    {
-                        string value = RawValueFormatter.GetDisplayValue(measureValue.Value, measureValue.Display);
-                        string postValue = RawValueFormatter.GetDisplayValue(measureValue.PostValue, measureValue.Display);
-                        string difference = string.Empty;
-
-                        if (measureValue.Difference != null)
-                            difference = $" (∆ {RawValueFormatter.GetDisplayValue(measureValue.Difference, measureValue.Display)})";
-
-                        output += "<p>";
-                        output += "<b>" + measureValue.Names.GetValue(cF4SDCockpitXmlConfig.Instance.HealthCardConfig.ProtocollLanguage) + ": </b>" + value + " ➜ " + postValue + difference;
-                        output += "</p>";
-                    }
-                    catch (Exception E)
-                    {
-                        LogException(E);
-                    }
-                }
-            }
-            catch (Exception E)
-            {
-                LogException(E);
-            }
-
-            return output;
-        }
-
-
-        #endregion
-
         #endregion
 
         #region ToolTipHandling
diff --git a/FasdDesktopUi/Pages/DetailsPage/DetailsPageView.xaml.cs b/FasdDesktopUi/Pages/DetailsPage/DetailsPageView.xaml.cs
index ff12a3b..380dfea 100644
--- a/FasdDesktopUi/Pages/DetailsPage/DetailsPageView.xaml.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/DetailsPageView.xaml.cs
@@ -461,7 +461,7 @@ namespace FasdDesktopUi.Pages.DetailsPage
                 List<Task> tasks = new List<Task>
                 {
                     _supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.UpdateOnlineStatusAsync(),
-                    _supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.RefreshLatestDataAsync()
+                    _supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.LoadingHelper?.RefreshLatestDataAsync()
                 };
 
                 await Task.WhenAll(tasks);
@@ -1591,7 +1591,7 @@ namespace FasdDesktopUi.Pages.DetailsPage
             {
                 midnightTimer.Stop();
 
-                var from = _supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.LastDataRequest;
+                var from = _supportCase?.SupportCaseDataProviderArtifact?.HealthCardDataHelper?.LoadingHelper?.LastDataRequest;
 
                 if (from == null)
                 {
diff --git a/FasdDesktopUi/Pages/DetailsPage/DetailsPageViewModel.cs b/FasdDesktopUi/Pages/DetailsPage/DetailsPageViewModel.cs
index 8e53e2d..a1585df 100644
--- a/FasdDesktopUi/Pages/DetailsPage/DetailsPageViewModel.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/DetailsPageViewModel.cs
@@ -147,8 +147,8 @@ namespace FasdDesktopUi.Pages.DetailsPage.ViewModels
 
         #region DetailsData property
 
-        private List<cDetailsPageDataHistoryDataModel> detailsDataList;
-        public List<cDetailsPageDataHistoryDataModel> DetailsDataList
+        private cDetailsPageDataHistoryDataModel detailsDataList;
+        public cDetailsPageDataHistoryDataModel DetailsDataList
         {
             get { return detailsDataList; }
             set
diff --git a/FasdDesktopUi/Pages/DetailsPage/Models/DetailsPageBase.cs b/FasdDesktopUi/Pages/DetailsPage/Models/DetailsPageBase.cs
index a963501..61b6fd7 100644
--- a/FasdDesktopUi/Pages/DetailsPage/Models/DetailsPageBase.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/Models/DetailsPageBase.cs
@@ -33,7 +33,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.Models
 
         //Details
         public TimeSpan TimeSinceLastRefresh { get; set; } = new TimeSpan(0, 1, 0);
-        public List<cDetailsPageDataHistoryDataModel> DataHistoryList { get; set; }
+        public cDetailsPageDataHistoryDataModel DataHistoryList { get; set; }
         public int ShownValueColumnsCount { get; set; }
 
         //Customizable Section
diff --git a/FasdDesktopUi/Pages/DetailsPage/Models/cDetailsPageDataHistoryDataModel.cs b/FasdDesktopUi/Pages/DetailsPage/Models/cDetailsPageDataHistoryDataModel.cs
index 25cb6d9..f2cfc45 100644
--- a/FasdDesktopUi/Pages/DetailsPage/Models/cDetailsPageDataHistoryDataModel.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/Models/cDetailsPageDataHistoryDataModel.cs
@@ -10,19 +10,12 @@ using FasdDesktopUi.Basics.Models;
 
 namespace FasdDesktopUi.Pages.DetailsPage.Models
 {
-    public class DetailsPageDataHistoryValueModel : cDataHistoryValueModel
+    public class DetailsPageDataHistoryColumnModel : cDataHistoryValueModel
     {
-        public enumHistoryTitleType? PresentationStyle { get; set; }
-
-        public List<List<string>> DetailedData { get; set; }
+        public List<cDataHistoryValueModel> ColumnValues { get; set; }
     }
 
-    public class DetailsPageDataHistoryColumnModel : DetailsPageDataHistoryValueModel
-    {
-        public List<DetailsPageDataHistoryValueModel> ColumnValues { get; set; }
-    }
-
-    public class cDetailsPageDataHistoryDataModel
+    public class cDetailsPageDataHistoryCategoryDataModel
     {
         public DetailsPageDataHistoryColumnModel TitleColumn { get; set; }
         public List<DetailsPageDataHistoryColumnModel> ValueColumns { get; set; }
@@ -30,9 +23,13 @@ namespace FasdDesktopUi.Pages.DetailsPage.Models
         public double ValueColumnWidth { get; set; } = 100;
     }
 
+    public class cDetailsPageDataHistoryDataModel : List<cDetailsPageDataHistoryCategoryDataModel>
+    {
+    }
+
     public class DataHistoryEventArgs : RoutedEventArgs
     {
-        public DetailsPageDataHistoryValueModel HistoryValueData { get; set; }
+        public cDataHistoryValueModel HistoryValueData { get; set; }
 
         public DataHistoryEventArgs()
         {
diff --git a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryCollection.xaml.cs b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryCollection.xaml.cs
index fda8652..5406dee 100644
--- a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryCollection.xaml.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryCollection.xaml.cs
@@ -109,11 +109,11 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
         }
 
         public static readonly DependencyProperty HistoryDataListProperty =
-            DependencyProperty.Register("HistoryDataList", typeof(List<cDetailsPageDataHistoryDataModel>), typeof(DetailsPageDataHistoryCollection), new PropertyMetadata(new List<cDetailsPageDataHistoryDataModel>(), new PropertyChangedCallback(RefreshDataCallback)));
+            DependencyProperty.Register("HistoryDataList", typeof(cDetailsPageDataHistoryDataModel), typeof(DetailsPageDataHistoryCollection), new PropertyMetadata(new cDetailsPageDataHistoryDataModel(), new PropertyChangedCallback(RefreshDataCallback)));
 
-        public List<cDetailsPageDataHistoryDataModel> HistoryDataList
+        public cDetailsPageDataHistoryDataModel HistoryDataList
         {
-            get { return (List<cDetailsPageDataHistoryDataModel>)GetValue(HistoryDataListProperty); }
+            get { return (cDetailsPageDataHistoryDataModel)GetValue(HistoryDataListProperty); }
             set { SetValue(HistoryDataListProperty, value); }
         }
 
@@ -380,7 +380,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
 
         #region UpdateData
 
-        public void UpdateHistory(List<cDetailsPageDataHistoryDataModel> historyData)
+        public void UpdateHistory(cDetailsPageDataHistoryDataModel historyData)
         {
             try
             {
@@ -414,7 +414,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             }
         }
 
-        private bool DidHistoryCategoryChange(cDetailsPageDataHistoryDataModel oldValue, cDetailsPageDataHistoryDataModel newValue)
+        private bool DidHistoryCategoryChange(cDetailsPageDataHistoryCategoryDataModel oldValue, cDetailsPageDataHistoryCategoryDataModel newValue)
         {
             var CM = MethodBase.GetCurrentMethod();
             LogMethodBegin(CM);
@@ -490,7 +490,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             return new Size(formattedText.Width, formattedText.Height);
         }
 
-        private double GetTitleColumnWidth(cDetailsPageDataHistoryDataModel detailsData)
+        private double GetTitleColumnWidth(cDetailsPageDataHistoryCategoryDataModel detailsData)
         {
             double maxTitleLength = MeasureStringSize(detailsData.TitleColumn.Content, new TextBox { Style = titleColumnOverViewTitleStyle }).Width + 90;
 
@@ -518,7 +518,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             return maxTitleLength;
         }
 
-        private double GetValueColumnWidth(cDetailsPageDataHistoryDataModel detailsData)
+        private double GetValueColumnWidth(cDetailsPageDataHistoryCategoryDataModel detailsData)
         {
             double maxValueWidth = 55; //55 to set MinWidth
 
diff --git a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistorySection.xaml.cs b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistorySection.xaml.cs
index 411324a..4db3c22 100644
--- a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistorySection.xaml.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistorySection.xaml.cs
@@ -112,7 +112,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             {
                 foreach (DetailsPageDataHistoryValueColumn valueColumn in _me.MainGrid.Children)
                 {
-                    valueColumn.ColumnValues = new DetailsPageDataHistoryColumnModel() { HighlightColor = Basics.Enums.enumHighlightColor.none, IsLoading = true, ColumnValues = new List<DetailsPageDataHistoryValueModel>() { new DetailsPageDataHistoryValueModel() { Content = "-", IsLoading = true } } };
+                    valueColumn.ColumnValues = new DetailsPageDataHistoryColumnModel() { HighlightColor = Basics.Enums.enumHighlightColor.none, IsLoading = true, ColumnValues = new List<cDataHistoryValueModel>() { new cDataHistoryValueModel() { Content = "-", IsLoading = true } } };
                 }
                 return;
             }
@@ -122,11 +122,11 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
         }
 
         public static readonly DependencyProperty HistoryDataProperty =
-            DependencyProperty.Register("HistoryData", typeof(cDetailsPageDataHistoryDataModel), typeof(DetailsPageDataHistorySection), new PropertyMetadata(new cDetailsPageDataHistoryDataModel(), new PropertyChangedCallback(RefreshDataCallback)));
+            DependencyProperty.Register("HistoryData", typeof(cDetailsPageDataHistoryCategoryDataModel), typeof(DetailsPageDataHistorySection), new PropertyMetadata(new cDetailsPageDataHistoryCategoryDataModel(), new PropertyChangedCallback(RefreshDataCallback)));
 
-        public cDetailsPageDataHistoryDataModel HistoryData
+        public cDetailsPageDataHistoryCategoryDataModel HistoryData
         {
-            get { return (cDetailsPageDataHistoryDataModel)GetValue(HistoryDataProperty); }
+            get { return (cDetailsPageDataHistoryCategoryDataModel)GetValue(HistoryDataProperty); }
             set { SetValue(HistoryDataProperty, value); }
         }
 
@@ -292,19 +292,6 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
                         valueColumnControl.AggregateRowIndexes = aggregateRowIndexes;
 
                         valueColumnControl.ColumnValues = valueColumnEnumerator.Current;
-
-                        foreach (var rowValue in valueColumnControl.ColumnValues.ColumnValues)
-                        {
-                            try
-                            {
-                                if (titleColumnEnumerator.MoveNext())
-                                    rowValue.DetailedData = titleColumnEnumerator.Current.DetailedData;
-                            }
-                            catch (Exception E)
-                            {
-                                LogException(E);
-                            }
-                        }
                     }
                     catch (Exception E)
                     {
@@ -346,7 +333,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             return false;
         }
 
-        public void UpdateHistoryData(cDetailsPageDataHistoryDataModel historyData)
+        public void UpdateHistoryData(cDetailsPageDataHistoryCategoryDataModel historyData)
         {
             var CM = MethodBase.GetCurrentMethod();
             LogMethodBegin(CM);
diff --git a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryTitleColumn.xaml.cs b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryTitleColumn.xaml.cs
index 294797c..9eb9bed 100644
--- a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryTitleColumn.xaml.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryTitleColumn.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -13,17 +14,19 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
+using C4IT.FASD.Base;
+using C4IT.Logging;
+
+using F4SD_AdaptableIcon.Enums;
+
+using FasdDesktopUi.Basics.Enums;
+using FasdDesktopUi.Basics.Models;
 using FasdDesktopUi.Basics.UiActions;
 using FasdDesktopUi.Basics.UserControls;
-using FasdDesktopUi.Pages.DetailsPage.Models;
-using FasdDesktopUi.Basics.Enums;
-
-using C4IT.Logging;
 using FasdDesktopUi.Basics.UserControls.AdaptableIcon;
-using C4IT.FASD.Base;
-using System.Reflection;
+using FasdDesktopUi.Pages.DetailsPage.Models;
+
 using static C4IT.Logging.cLogManager;
-using F4SD_AdaptableIcon.Enums;
 
 namespace FasdDesktopUi.Pages.DetailsPage.UserControls
 {
@@ -165,7 +168,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             if (!(sender is FrameworkElement FE))
                 return;
 
-            if (!(FE.Tag is DetailsPageDataHistoryValueModel HistorySubtitleValue))
+            if (!(FE.Tag is cDataHistoryValueModel HistorySubtitleValue))
                 return;
 
             if (HistorySubtitleValue.UiAction == null)
@@ -284,7 +287,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             if (!(sender is FrameworkElement FE))
                 return;
 
-            if (!(FE.Tag is DetailsPageDataHistoryValueModel HistorySubtitleValue))
+            if (!(FE.Tag is cDataHistoryValueModel HistorySubtitleValue))
                 return;
 
             if (string.IsNullOrEmpty(HistorySubtitleValue.ContentDescription) || HistorySubtitleValue.ContentDescription == HistorySubtitleValue.Content)
diff --git a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryValueColumn.xaml.cs b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryValueColumn.xaml.cs
index 7ce8ca8..544c234 100644
--- a/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryValueColumn.xaml.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/UserControls/DataHistory/DetailsPageDataHistoryValueColumn.xaml.cs
@@ -129,7 +129,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             }
         }
 
-        private void UpdateBorderThresholdValues(Border border, DetailsPageDataHistoryValueModel valueInfo)
+        private void UpdateBorderThresholdValues(Border border, cDataHistoryValueModel valueInfo)
         {
             try
             {
@@ -236,7 +236,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             if (!(sender is FrameworkElement FE))
                 return;
 
-            if (!(FE.Tag is DetailsPageDataHistoryValueModel HistoryValue))
+            if (!(FE.Tag is cDataHistoryValueModel HistoryValue))
                 return;
 
             if (HistoryValue.UiAction == null)
@@ -469,7 +469,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
 
         #region UpdateValues
 
-        private bool DidCellValueChange(DetailsPageDataHistoryValueModel oldData, DetailsPageDataHistoryValueModel newData)
+        private bool DidCellValueChange(cDataHistoryValueModel oldData, cDataHistoryValueModel newData)
         {
             try
             {
diff --git a/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageRefreshControl.xaml.cs b/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageRefreshControl.xaml.cs
index 3d71ab7..10d56ec 100644
--- a/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageRefreshControl.xaml.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageRefreshControl.xaml.cs
@@ -73,7 +73,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             try
             {
                 string newText = string.Empty;
-                if (DataProvider?.HealthCardDataHelper?.LastDataRequest is null)
+                if (DataProvider?.HealthCardDataHelper?.LoadingHelper?.LastDataRequest is null)
                 {
                     LastDataRequestTextBlock.Text = newText;
                     return;
@@ -82,7 +82,7 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
                 string dateAddtionFormat = cMultiLanguageSupport.GetItem("DetailsPage.LastRefresh");
                 string timeText = string.Empty;
 
-                var from = DataProvider?.HealthCardDataHelper?.LastDataRequest;
+                var from = DataProvider?.HealthCardDataHelper?.LoadingHelper?.LastDataRequest;
                 if (from == null)
                     return;
 
diff --git a/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml b/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml
index 6257794..9927135 100644
--- a/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml
+++ b/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml
@@ -50,24 +50,17 @@
                 </Style>
             </StackPanel.Resources>
 
-            <ico:AdaptableIcon x:Name="SlimPageButton"
-                               MouseLeftButtonUp="SlimPageButton_MouseLeftButtonUp"
-                               TouchDown="SlimPageButton_TouchDown"
-                               ToolTip="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Global.NavBar.ToSlim}"
-                               SelectedInternIcon="window_toSlim"
-                               Margin="0"/>
-
             <ico:AdaptableIcon x:Name="MinimizeButton"
                                BorderPadding="0 10 0 0"
                                VerticalAlignment="Bottom"
-                               MouseUp="MinimizeButton_MouseUp"
-                               TouchDown="MinimizeButton_TouchDown"
+                               MouseUp="MinimizeButton_Click"
+                               TouchDown="MinimizeButton_Click"
                                ToolTip="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Global.NavBar.Minimize}"
                                SelectedInternIcon="window_minimize" />
 
             <ico:AdaptableIcon x:Name="WindowSizeButton"
-                               MouseUp="WindowSizeButton_MouseUp"
-                               TouchDown="WindowSizeButton_TouchDown">
+                               MouseUp="WindowSizeButton_Click"
+                               TouchDown="WindowSizeButton_Click">
 
                 <ico:AdaptableIcon.Resources>
                     <Style TargetType="ico:AdaptableIcon"
@@ -100,8 +93,8 @@
             </ico:AdaptableIcon>
 
             <ico:AdaptableIcon x:Name="CloseButton"
-                               MouseUp="CloseButton_MouseUp"
-                               TouchDown="CloseButton_TouchDown"
+                               MouseUp="CloseButton_Click"
+                               TouchDown="CloseButton_Click"
                                Margin="7.5 0 0 0"
                                ToolTip="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Global.NavBar.Close}"
                                SelectedInternIcon="window_close" />
diff --git a/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml.cs b/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml.cs
index 9e10f1a..b5c3864 100644
--- a/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml.cs
+++ b/FasdDesktopUi/Pages/DetailsPage/UserControls/DetailsPageWindowStateBar.xaml.cs
@@ -1,13 +1,6 @@
-using FasdDesktopUi.Basics;
-using FasdDesktopUi.Pages.SettingsPage;
-using FasdDesktopUi.Pages.SlimPage;
-using System;
-using System.Linq;
-using System.Reflection;
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using static C4IT.Logging.cLogManager;
 
 namespace FasdDesktopUi.Pages.DetailsPage.UserControls
 {
@@ -18,84 +11,22 @@ namespace FasdDesktopUi.Pages.DetailsPage.UserControls
             InitializeComponent();
         }
 
-        #region MinimizeButton
-
-        private void Minimize_Click(object sender)
+        private void MinimizeButton_Click(object sender, InputEventArgs e)
         {
             if (sender is UIElement senderVisual)
                 Window.GetWindow(senderVisual).WindowState = WindowState.Minimized;
         }
 
-        private void MinimizeButton_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            Minimize_Click(sender);
-        }
-
-        private void MinimizeButton_TouchDown(object sender, TouchEventArgs e)
-        {
-            Minimize_Click(sender);
-        }
-
-        #endregion
-
-        #region WindowSizeButton
-
-        private void WindowSize_Click(object sender)
+        private void WindowSizeButton_Click(object sender, InputEventArgs e)
         {
             if (sender is UIElement senderVisual)
                 Window.GetWindow(senderVisual).WindowState = Window.GetWindow(senderVisual).WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
         }
 
-        private void WindowSizeButton_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            WindowSize_Click(sender);
-        }
-
-        private void WindowSizeButton_TouchDown(object sender, TouchEventArgs e)
-        {
-            WindowSize_Click(sender);
-        }
-
-        #endregion
-
-        #region CloseButton
-
-        private void CloseButton_Click(object sender)
+        private void CloseButton_Click(object sender, InputEventArgs e)
         {
             if (sender is UIElement senderVisual)
                 Window.GetWindow(senderVisual).Close();
         }
-
-        private void CloseButton_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            CloseButton_Click(sender);
-        }
-
-        private void CloseButton_TouchDown(object sender, TouchEventArgs e)
-        {
-            CloseButton_Click(sender);
-        }
-
-        #endregion
-
-        #region SlimPageButton
-
-        private void SlimPageButton_Click()
-        {
-            App.HideAllSettingViews();
-            Window.GetWindow(this).Hide();
-            cSupportCaseDataProvider.slimPage?.Show();
-        }
-        private void SlimPageButton_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            SlimPageButton_Click();
-        }
-
-        private void SlimPageButton_TouchDown(object sender, TouchEventArgs e)
-        {
-            SlimPageButton_Click();
-        }
-
-        #endregion
     }
 }
diff --git a/FasdDesktopUi/Pages/SlimPage/SlimPageView.xaml.cs b/FasdDesktopUi/Pages/SlimPage/SlimPageView.xaml.cs
index 1183efa..8896f31 100644
--- a/FasdDesktopUi/Pages/SlimPage/SlimPageView.xaml.cs
+++ b/FasdDesktopUi/Pages/SlimPage/SlimPageView.xaml.cs
@@ -348,8 +348,8 @@ namespace FasdDesktopUi.Pages.SlimPage
 
                 if (_supportCase != null)
                 {
-                    _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataChanged -= DataProvider_DataChanged;
-                    _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
+                    _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataChanged -= DataProvider_DataChanged;
+                    _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
                 }
             }
             catch (Exception E)
diff --git a/FasdDesktopUi/Pages/SupportCasePageBase/SupportCasePageBase.cs b/FasdDesktopUi/Pages/SupportCasePageBase/SupportCasePageBase.cs
index 1e76397..8f2fb1f 100644
--- a/FasdDesktopUi/Pages/SupportCasePageBase/SupportCasePageBase.cs
+++ b/FasdDesktopUi/Pages/SupportCasePageBase/SupportCasePageBase.cs
@@ -19,14 +19,14 @@ namespace FasdDesktopUi.Pages
         {
             if (_supportCase != null)
             {
-                _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataChanged -= DataProvider_DataChanged;
-                _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
+                _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataChanged -= DataProvider_DataChanged;
+                _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataFullyLoaded -= DataProvider_DataFullyLoaded;
                 _supportCase.SupportCaseDataProviderArtifact.DirectConnectionHelper.DirectConnectionChanged -= DirectConnectionHelper_DirectConnectionChanged;
             }
 
             _supportCase = supportCase;
-            _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataChanged += DataProvider_DataChanged;
-            _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.DataFullyLoaded += DataProvider_DataFullyLoaded;
+            _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataChanged += DataProvider_DataChanged;
+            _supportCase.SupportCaseDataProviderArtifact.HealthCardDataHelper.LoadingHelper.DataFullyLoaded += DataProvider_DataFullyLoaded;
             _supportCase.SupportCaseDataProviderArtifact.DirectConnectionHelper.DirectConnectionChanged += DirectConnectionHelper_DirectConnectionChanged;
         }
 
diff --git a/FasdDesktopUi/ResourceDictionaries/ComboBoxResources.xaml b/FasdDesktopUi/ResourceDictionaries/ComboBoxResources.xaml
index 8ceea8a..4471000 100644
--- a/FasdDesktopUi/ResourceDictionaries/ComboBoxResources.xaml
+++ b/FasdDesktopUi/ResourceDictionaries/ComboBoxResources.xaml
@@ -83,30 +83,32 @@
     
     <!--#region ComboBox default-->
 
-    <Style x:Key="ComboBoxToggleButton"
-           TargetType="{x:Type ToggleButton}">
-        <Setter Property="OverridesDefaultStyle"
-                Value="true" />
-        <Setter Property="IsTabStop"
-                Value="false" />
-        <Setter Property="Focusable"
-                Value="false" />
-        <Setter Property="ClickMode"
-                Value="Press" />
-        <Setter Property="Border.CornerRadius"
-                Value="7.5" />
-        <Setter Property="Border.BorderThickness"
-                Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Border x:Name="templateRoot"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Border.CornerRadius}"
-                            SnapsToDevicePixels="true"
-                            Height="28">
+    <Style x:Key="ComboBoxToggleButton"
+           TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle"
+                Value="true" />
+        <Setter Property="IsTabStop"
+                Value="false" />
+        <Setter Property="Focusable"
+                Value="false" />
+        <Setter Property="ClickMode"
+                Value="Press" />
+        <Setter Property="Border.CornerRadius"
+                Value="7.5" />
+        <Setter Property="Border.BorderThickness"
+                Value="1" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="templateRoot"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding Border.CornerRadius}"
+                            SnapsToDevicePixels="true"
+                            Height="28">
                         <Border x:Name="splitBorder"
                                 BorderBrush="Transparent"
                                 BorderThickness="1"
@@ -1459,4 +1461,4 @@
 
     <!--#endregion-->
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml b/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml
index 0479a37..6335400 100644
--- a/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml
+++ b/FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml
@@ -54,7 +54,7 @@
         <Setter Property="BorderThickness"
                 Value="1" />
         <Setter Property="Padding"
-                Value="1" />
+                Value="0" />
         <Setter Property="CornerRadius"
                 Value="7.5" />
         <Setter Property="Background"