From 9ff0f26884d107e7229dc6d584c5cbbbcbf66add Mon Sep 17 00:00:00 2001
From: Christian <6939810+chkr1011@users.noreply.github.com>
Date: Sun, 27 Nov 2022 12:27:04 +0100
Subject: [PATCH 1/3] Refactor code

---
 Source/Pages/Connection/ConnectionPageView.axaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Source/Pages/Connection/ConnectionPageView.axaml b/Source/Pages/Connection/ConnectionPageView.axaml
index 6aa0655..8c77b0e 100644
--- a/Source/Pages/Connection/ConnectionPageView.axaml
+++ b/Source/Pages/Connection/ConnectionPageView.axaml
@@ -28,12 +28,7 @@
             </Grid.ColumnDefinitions>
 
             <!-- The list of publish items. -->
-            <Grid Background="#262626">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-
+            <Grid Background="#262626" RowDefinitions="Auto,*">
                 <StackPanel Orientation="Horizontal"
                             Grid.Row="0"
                             Classes="tool_bar"

From 3c633b8c766a6082df276d60f00c8699664e5c13 Mon Sep 17 00:00:00 2001
From: Christian <6939810+chkr1011@users.noreply.github.com>
Date: Sun, 27 Nov 2022 12:55:35 +0100
Subject: [PATCH 2/3] Show payload sizes in topic explorer

---
 .../Pages/Connection/ConnectionPageView.axaml |  9 +---
 Source/Pages/Inflight/InflightPageView.axaml  |  2 +-
 .../PacketInspectorPageView.axaml             |  2 +-
 Source/Pages/Publish/PublishPageView.axaml    | 16 ++----
 .../Subscriptions/SubscriptionsPageView.axaml | 16 ++----
 .../TopicExplorerItemMessageViewModel.cs      |  5 +-
 .../TopicExplorer/TopicExplorerItemView.axaml |  8 +--
 .../TopicExplorerItemViewModel.cs             | 17 ++++++
 .../TopicExplorer/TopicExplorerPageView.axaml | 16 ++----
 .../TopicExplorerTreeNodeView.axaml           | 53 ++++++++++++-------
 10 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/Source/Pages/Connection/ConnectionPageView.axaml b/Source/Pages/Connection/ConnectionPageView.axaml
index 8c77b0e..f024b1a 100644
--- a/Source/Pages/Connection/ConnectionPageView.axaml
+++ b/Source/Pages/Connection/ConnectionPageView.axaml
@@ -20,12 +20,7 @@
     <controls:Overlay IsOverlayVisible="{Binding Path=OverlayContent, Converter={x:Static ObjectConverters.IsNotNull}}"
                       OverlayContent="{Binding OverlayContent}">
 
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="1" />
-                <ColumnDefinition Width="3*" />
-            </Grid.ColumnDefinitions>
+        <Grid ColumnDefinitions="*,Auto,3*">
 
             <!-- The list of publish items. -->
             <Grid Background="#262626" RowDefinitions="Auto,*">
@@ -56,7 +51,7 @@
 
             <!-- The splitter -->
             <GridSplitter Grid.Column="1"
-                          Width="1" />
+                          Width="2" />
 
             <!-- The selected item. -->
             <ContentPresenter Margin="10"
diff --git a/Source/Pages/Inflight/InflightPageView.axaml b/Source/Pages/Inflight/InflightPageView.axaml
index f9b70ac..dbc6057 100644
--- a/Source/Pages/Inflight/InflightPageView.axaml
+++ b/Source/Pages/Inflight/InflightPageView.axaml
@@ -128,7 +128,7 @@
                 </DataGrid>
 
                 <!-- The splitter -->
-                <GridSplitter Grid.Column="1" />
+                <GridSplitter Grid.Column="1" Width="2" />
 
                 <!-- The details of the selected item -->
                 <Grid Grid.Column="2"
diff --git a/Source/Pages/PacketInspector/PacketInspectorPageView.axaml b/Source/Pages/PacketInspector/PacketInspectorPageView.axaml
index 0d2ce2c..eb7de7b 100644
--- a/Source/Pages/PacketInspector/PacketInspectorPageView.axaml
+++ b/Source/Pages/PacketInspector/PacketInspectorPageView.axaml
@@ -109,7 +109,7 @@
             </DataGrid>
 
             <!-- The splitter -->
-            <GridSplitter Grid.Column="1" />
+            <GridSplitter Grid.Column="1" Width="2" />
 
             <!-- The details of the selected packet -->
             <Grid Grid.Column="2"
diff --git a/Source/Pages/Publish/PublishPageView.axaml b/Source/Pages/Publish/PublishPageView.axaml
index 8b4d3a7..eef49cb 100644
--- a/Source/Pages/Publish/PublishPageView.axaml
+++ b/Source/Pages/Publish/PublishPageView.axaml
@@ -20,19 +20,11 @@
     <controls:Overlay IsOverlayVisible="{Binding Path=OverlayContent, Converter={x:Static ObjectConverters.IsNotNull}}"
                       OverlayContent="{Binding OverlayContent}">
 
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="1" />
-                <ColumnDefinition Width="3*" />
-            </Grid.ColumnDefinitions>
+        <Grid ColumnDefinitions="*,Auto,3*">
 
             <!-- The list of publish items. -->
-            <Grid Background="#262626">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
+            <Grid Background="#262626"
+                  RowDefinitions="Auto,*">
 
                 <StackPanel Orientation="Horizontal"
                             Grid.Row="0"
@@ -61,7 +53,7 @@
 
             <!-- The splitter -->
             <GridSplitter Grid.Column="1"
-                          Width="1" />
+                          Width="2" />
 
             <!-- The selected item. -->
             <publish:PublishItemView Margin="10"
diff --git a/Source/Pages/Subscriptions/SubscriptionsPageView.axaml b/Source/Pages/Subscriptions/SubscriptionsPageView.axaml
index c665cf3..51c7718 100644
--- a/Source/Pages/Subscriptions/SubscriptionsPageView.axaml
+++ b/Source/Pages/Subscriptions/SubscriptionsPageView.axaml
@@ -15,19 +15,11 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="1" />
-            <ColumnDefinition Width="3*" />
-        </Grid.ColumnDefinitions>
+    <Grid ColumnDefinitions="*,Auto,3*">
 
         <!-- The list of subscription items. -->
-        <Grid Background="#262626">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
+        <Grid Background="#262626"
+              RowDefinitions="Auto,*">
 
             <StackPanel Orientation="Horizontal"
                         Grid.Row="0"
@@ -55,7 +47,7 @@
 
         <!-- The splitter -->
         <GridSplitter Grid.Column="1"
-                      Width="1" />
+                      Width="2" />
 
         <!-- The selected item. -->
         <subscriptions:SubscriptionItemView Margin="10"
diff --git a/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs b/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs
index 2da52fc..d2e7439 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs
+++ b/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs
@@ -16,6 +16,7 @@ public TopicExplorerItemMessageViewModel(DateTime timestamp, MqttApplicationMess
 
         Timestamp = timestamp;
         Payload = payload ?? throw new ArgumentNullException(nameof(payload));
+        PayloadLength = applicationMessage.Payload?.Length ?? 0;
         Retain = applicationMessage.Retain;
 
         Delay = delay;
@@ -27,8 +28,10 @@ public TopicExplorerItemMessageViewModel(DateTime timestamp, MqttApplicationMess
     public InflightPageItemViewModel InflightItem { get; init; }
 
     public string Payload { get; init; }
+    
+    public int PayloadLength { get; }
 
-    public bool Retain { get; init; }
+    public bool Retain { get; }
 
     public DateTime Timestamp { get; init; }
 }
\ No newline at end of file
diff --git a/Source/Pages/TopicExplorer/TopicExplorerItemView.axaml b/Source/Pages/TopicExplorer/TopicExplorerItemView.axaml
index d96914c..9d2039b 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerItemView.axaml
+++ b/Source/Pages/TopicExplorer/TopicExplorerItemView.axaml
@@ -10,13 +10,7 @@
              d:DataContext="{d:DesignInstance topicExplorer:TopicExplorerItemViewModel}"
              d:DesignHeight="450"
              x:Class="MQTTnetApp.Pages.TopicExplorer.TopicExplorerItemView">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="1" />
-            <RowDefinition Height="3*" />
-        </Grid.RowDefinitions>
+    <Grid RowDefinitions="Auto,*,1,3*">
 
         <!-- ToolBar -->
         <StackPanel Orientation="Horizontal"
diff --git a/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs b/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs
index 88bc741..e01a927 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs
+++ b/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs
@@ -14,7 +14,9 @@ public sealed class TopicExplorerItemViewModel : BaseViewModel
     readonly TopicExplorerPageViewModel _ownerPage;
 
     string? _currentPayload;
+    int _currentPayloadLength;
     TopicExplorerItemMessageViewModel? _selectedMessage;
+    int _totalPayloadLength;
     bool _trackLatestMessage;
 
     public TopicExplorerItemViewModel(TopicExplorerPageViewModel ownerPage)
@@ -34,6 +36,12 @@ private set
         }
     }
 
+    public int CurrentPayloadLength
+    {
+        get => _currentPayloadLength;
+        private set => this.RaiseAndSetIfChanged(ref _currentPayloadLength, value);
+    }
+
     public bool HasPayload => CurrentPayload != null;
 
     public CollectionViewModel<TopicExplorerItemMessageViewModel> Messages { get; } = new();
@@ -44,6 +52,12 @@ public TopicExplorerItemMessageViewModel? SelectedMessage
         set => this.RaiseAndSetIfChanged(ref _selectedMessage, value);
     }
 
+    public int TotalPayloadLength
+    {
+        get => _totalPayloadLength;
+        private set => this.RaiseAndSetIfChanged(ref _totalPayloadLength, value);
+    }
+
     public bool TrackLatestMessage
     {
         get => _trackLatestMessage;
@@ -74,6 +88,8 @@ public void AddMessage(MqttApplicationMessage message)
             payload = string.Empty;
         }
 
+        TotalPayloadLength += message.Payload?.Length ?? 0;
+
         var timestamp = DateTime.Now;
         var duration = TimeSpan.Zero;
         var lastMessage = Messages.LastOrDefault();
@@ -106,5 +122,6 @@ public void Clear()
     void OnMessagesChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
         CurrentPayload = Messages.LastOrDefault()?.Payload ?? string.Empty;
+        CurrentPayloadLength = Messages.LastOrDefault()?.PayloadLength ?? 0;
     }
 }
\ No newline at end of file
diff --git a/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml b/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml
index 67fc972..e0cc6bb 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml
+++ b/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml
@@ -14,20 +14,12 @@
     <controls:Overlay IsOverlayVisible="{Binding Path=OverlayContent, Converter={x:Static ObjectConverters.IsNotNull}}"
                       OverlayContent="{Binding OverlayContent}">
 
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="1" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
+        <Grid ColumnDefinitions="*,Auto,*">
 
             <!-- The tree of topics. -->
             <Grid Grid.Column="0"
-                  Background="#262626">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
+                  Background="#262626"
+                  RowDefinitions="Auto,*">
 
                 <!-- Tool Bar -->
                 <StackPanel Classes="tool_bar"
@@ -124,7 +116,7 @@
 
             <!-- The splitter -->
             <GridSplitter Grid.Column="1"
-                          Width="1" />
+                          Width="2" />
 
             <Grid Grid.Column="2">
 
diff --git a/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml b/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml
index 5305513..1ad5b04 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml
+++ b/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml
@@ -8,32 +8,47 @@
              d:DesignHeight="450"
              d:DataContext="{d:DesignInstance topicExplorer:TopicExplorerTreeNodeViewModel}"
              x:Class="MQTTnetApp.Pages.TopicExplorer.TopicExplorerTreeNodeView">
-    <StackPanel Orientation="Horizontal">
 
-        <!-- The topic name -->
+    <StackPanel Orientation="Vertical" Margin="0,3">
+
         <StackPanel Orientation="Horizontal">
-            <TextBlock Classes="code_text"
-                       Text="{Binding Name}" />
 
-            <TextBlock Text="="
+            <!-- The topic name -->
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Classes="code_text"
+                           Text="{Binding Name}" />
+
+                <TextBlock Text="="
+                           FontStyle="Italic"
+                           IsVisible="{Binding Item.HasPayload, FallbackValue=False}"
+                           Margin="10,0" />
+            </StackPanel>
+
+            <!-- The latest payload -->
+            <TextBlock Classes="code_text"
+                       TextTrimming="CharacterEllipsis"
+                       TextWrapping="NoWrap"
                        FontStyle="Italic"
-                       IsVisible="{Binding Item.HasPayload, FallbackValue=False}"
-                       Margin="10,0" />
+                       Text="{Binding Item.CurrentPayload, FallbackValue=''}" />
         </StackPanel>
 
-        <!-- The latest payload -->
-        <TextBlock Classes="code_text"
-                   TextTrimming="CharacterEllipsis"
-                   FontStyle="Italic"
-                   Text="{Binding Item.CurrentPayload, FallbackValue=''}" />
-
         <!-- The statistics -->
-        <TextBlock Classes="code_text"
-                   TextTrimming="CharacterEllipsis"
-                   FontStyle="Italic"
-                   Margin="10,0,0,0"
-                   IsVisible="{Binding !Item.Messages.IsEmpty, FallbackValue=False}"
-                   Text="{Binding Path=Item.Messages.Count, StringFormat={}({0} messages), FallbackValue=0}" />
+        <StackPanel TextBlock.Foreground="Gray" Orientation="Horizontal" Margin="0,3" IsVisible="{Binding !Item.Messages.IsEmpty, FallbackValue=False}">
+            <TextBlock Classes="code_text"
+                       FontSize="10"
+                       TextTrimming="CharacterEllipsis"
+                       Text="{Binding Path=Item.Messages.Count, StringFormat={}{0} messages, FallbackValue=0}" />
+            <TextBlock Text="," Margin="0,0,10,0" />
+            <TextBlock Classes="code_text"
+                       FontSize="10"
+                       TextTrimming="CharacterEllipsis"
+                       Text="{Binding Path=Item.CurrentPayloadLength, StringFormat={}{0} bytes (latest message), FallbackValue=0}" />
+            <TextBlock Text="," Margin="0,0,10,0" />
+            <TextBlock Classes="code_text"
+                       FontSize="10"
+                       TextTrimming="CharacterEllipsis"
+                       Text="{Binding Path=Item.TotalPayloadLength, StringFormat={}{0} bytes (all message), FallbackValue=0}" />
+        </StackPanel>
 
     </StackPanel>
 </UserControl>
\ No newline at end of file

From 49fb6478f7497aaddae08bd1bb91985053e74f9b Mon Sep 17 00:00:00 2001
From: Christian <6939810+chkr1011@users.noreply.github.com>
Date: Thu, 8 Dec 2022 19:42:31 +0100
Subject: [PATCH 3/3] Add more details to topic explorer node

---
 Source/Assets/VectorIcons.axaml               |  4 +-
 Source/Main/MainWindow.axaml                  |  2 +-
 .../Pages/Inflight/InflightPageItemView.axaml |  2 +-
 .../Inflight/InflightPageItemViewModel.cs     |  4 +-
 Source/Pages/Info/InfoPageView.axaml          | 17 +---
 Source/Pages/Publish/PublishPageViewModel.cs  |  3 +-
 .../TopicExplorerItemMessageViewModel.cs      |  2 +-
 .../TopicExplorerItemViewModel.cs             | 11 ++-
 .../TopicExplorer/TopicExplorerPageView.axaml |  4 +-
 .../TopicExplorerTreeNodeView.axaml           | 92 ++++++++++++-------
 10 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/Source/Assets/VectorIcons.axaml b/Source/Assets/VectorIcons.axaml
index 5c5a210..bc8422e 100644
--- a/Source/Assets/VectorIcons.axaml
+++ b/Source/Assets/VectorIcons.axaml
@@ -15,7 +15,8 @@
     <StreamGeometry x:Key="arrow_upload_regular">M18.2498 3.50871C18.664 3.50883 19 3.17314 19 2.75892C19 2.34471 18.6644 2.00883 18.2502 2.00871L5.25022 2.00494C4.836 2.00482 4.5 2.34051 4.5 2.75473C4.5 3.16894 4.83557 3.50482 5.24978 3.50494L18.2498 3.50871ZM11.6482 21.9969L11.75 22.0038C12.1297 22.0038 12.4435 21.7216 12.4932 21.3555L12.5 21.2538L12.499 7.56876L16.2208 11.2891C16.4871 11.5553 16.9038 11.5795 17.1974 11.3616L17.2815 11.289C17.5477 11.0227 17.5719 10.606 17.354 10.3124L17.2814 10.2283L12.2837 5.23171C12.0176 4.96562 11.6012 4.94131 11.3076 5.15888L11.2235 5.2314L6.22003 10.228C5.92694 10.5207 5.92661 10.9956 6.21931 11.2887C6.48539 11.5551 6.90204 11.5796 7.1958 11.362L7.27997 11.2894L10.999 7.57576L11 21.2538C11 21.6335 11.2822 21.9473 11.6482 21.9969Z</StreamGeometry>
     <StreamGeometry x:Key="arrow_maximize_regular">M16.25,3 L24.25,3 C24.6296958,3 24.943491,3.28215388 24.9931534,3.64822944 L25,3.75 L25,11.75 C25,12.1642136 24.6642136,12.5 24.25,12.5 C23.8703042,12.5 23.556509,12.2178461 23.5068466,11.8517706 L23.5,11.75 L23.5,5.56 L5.56,23.5 L11.75,23.5 C12.1296958,23.5 12.443491,23.7821539 12.4931534,24.1482294 L12.5,24.25 C12.5,24.6296958 12.2178461,24.943491 11.8517706,24.9931534 L11.75,25 L3.75,25 C3.37030423,25 3.05650904,24.7178461 3.00684662,24.3517706 L3,24.25 L3,16.25 C3,15.8357864 3.33578644,15.5 3.75,15.5 C4.12969577,15.5 4.44349096,15.7821539 4.49315338,16.1482294 L4.5,16.25 L4.5,22.438 L22.438,4.5 L16.25,4.5 C15.8703042,4.5 15.556509,4.21784612 15.5068466,3.85177056 L15.5,3.75 C15.5,3.37030423 15.7821539,3.05650904 16.1482294,3.00684662 L16.25,3 L24.25,3 L16.25,3 Z</StreamGeometry>
     <StreamGeometry x:Key="arrow_minimize_vertical_regular">M13.7197 17.7803C14.0126 18.0732 14.4874 18.0732 14.7803 17.7803C15.0732 17.4874 15.0732 17.0126 14.7803 16.7197L12.2803 14.2197C11.9874 13.9268 11.5126 13.9268 11.2197 14.2197L8.71967 16.7197C8.42678 17.0126 8.42678 17.4874 8.71967 17.7803C9.01256 18.0732 9.48744 18.0732 9.78033 17.7803L11 16.5607L11 21.25C11 21.6642 11.3358 22 11.75 22C12.1642 22 12.5 21.6642 12.5 21.25V16.5607L13.7197 17.7803Z M4 11.75C4 11.3358 4.33579 11 4.75 11H19.25C19.6642 11 20 11.3358 20 11.75C20 12.1642 19.6642 12.5 19.25 12.5H4.75C4.33579 12.5 4 12.1642 4 11.75Z M12.5 2.75C12.5 2.33579 12.1642 2 11.75 2C11.3358 2 11 2.33579 11 2.75V6.93934L9.78033 5.71967C9.48744 5.42678 9.01256 5.42678 8.71967 5.71967C8.42678 6.01256 8.42678 6.48744 8.71967 6.78033L11.2197 9.28033C11.2916 9.35224 11.3745 9.40649 11.4629 9.44309C11.5513 9.47976 11.6483 9.5 11.75 9.5C11.9563 9.5 12.1431 9.41671 12.2787 9.28192C12.2793 9.28139 12.2798 9.28086 12.2803 9.28033 M12.2803 9.28033L14.7803 6.78033C15.0732 6.48744 15.0732 6.01256 14.7803 5.71967C14.4874 5.42678 14.0126 5.42678 13.7197 5.71967L12.5 6.93934V2.75</StreamGeometry>
-
+    <StreamGeometry x:Key="attach_regular">M11.7715948,3.74348899 C14.113054,1.39990252 17.9120439,1.39990252 20.2551897,3.74304827 C22.5382548,6.02611336 22.5967949,9.69132107 20.4308101,12.0452653 L20.2426506,12.2426307 L11.4426304,21.0408404 L11.4426304,21.0408404 L11.4060613,21.0710739 C9.94482388,22.3878538 7.69082246,22.3431052 6.28344814,20.9357309 C4.96443071,19.6167134 4.84231478,17.5540367 5.91710035,16.0973219 C5.94044402,16.0519637 5.96869088,16.0082157 6.00190455,15.9670689 L6.0554581,15.9074233 L6.14236585,15.819689 L6.28344814,15.671807 L6.28636585,15.674689 L13.7221045,8.22037508 C13.9880171,7.95375494 14.4046482,7.92899525 14.6985489,8.14645937 L14.7827638,8.21896569 C15.0493839,8.4848782 15.0741436,8.90150935 14.8566795,9.19541007 L14.7841732,9.27962492 L7.18955772,16.8927175 C6.471921,17.7683146 6.52180093,19.0625849 7.33919752,19.8799815 C8.16826244,20.7090464 9.48791296,20.7485257 10.3637003,19.9984193 L19.1963769,11.1679575 L19.1963769,11.1679575 C20.9518888,9.41031016 20.9518888,6.56106776 19.1945295,4.80370845 C17.4920877,3.10126661 14.7649391,3.0480653 12.9984531,4.64410452 L12.8305685,4.80370845 L12.8180195,4.81801948 L3.28169594,14.354343 C2.98880272,14.6472363 2.51392898,14.6472363 2.22103577,14.354343 C1.9547692,14.0880765 1.93056315,13.6714128 2.14841761,13.3778013 L2.22103577,13.2936829 L11.7699083,3.74304827 L11.7715948,3.74348899 Z</StreamGeometry>
+    
     <StreamGeometry x:Key="branch_regular">M7.5,2 C9.433,2 11,3.567 11,5.5 C11,7.08956 9.94036,8.43162 8.48893,8.85834 C9.17679,11.1112 11.272,12.75 13.75,12.75 L14.0805,12.75 C14.4239,11.1774 15.8244,10 17.5,10 C19.433,10 21,11.567 21,13.5 C21,15.433 19.433,17 17.5,17 C15.8244,17 14.4239,15.8226 14.0805,14.25 L13.75,14.25 C11.519,14.25 9.53183,13.2063 8.25,11.5805 L8.25,15.0805 C9.82259,15.4239 11,16.8244 11,18.5 C11,20.433 9.433,22 7.5,22 C5.567,22 4,20.433 4,18.5 C4,16.8244 5.17741,15.4239 6.75,15.0805 L6.75,8.91946 C5.17741,8.57612 4,7.17556 4,5.5 C4,3.567 5.567,2 7.5,2 Z M7.5,16.5 C6.39543,16.5 5.5,17.3954 5.5,18.5 C5.5,19.6046 6.39543,20.5 7.5,20.5 C8.60457,20.5 9.5,19.6046 9.5,18.5 C9.5,17.3954 8.60457,16.5 7.5,16.5 Z M17.5,11.5 C16.3954,11.5 15.5,12.3954 15.5,13.5 C15.5,14.6046 16.3954,15.5 17.5,15.5 C18.6046,15.5 19.5,14.6046 19.5,13.5 C19.5,12.3954 18.6046,11.5 17.5,11.5 Z M7.5,3.5 C6.39543,3.5 5.5,4.39543 5.5,5.5 C5.5,6.60457 6.39543,7.5 7.5,7.5 C8.60457,7.5 9.5,6.60457 9.5,5.5 C9.5,4.39543 8.60457,3.5 7.5,3.5 Z</StreamGeometry>
     <StreamGeometry x:Key="bug_regular">M10.5 2.75134C10.5 2.33713 10.1642 2.00134 9.75 2.00134C9.33579 2.00134 9 2.33713 9 2.75134V3.50345C9 4.13591 9.19571 4.72266 9.52988 5.20644C8.13703 5.68546 7.11506 6.96179 7.00909 8.49031H6.76245L6.75315 8.49029C5.51052 8.48515 4.50733 7.47364 4.51247 6.23101L4.51861 4.74541C4.52032 4.3312 4.18593 3.99403 3.77172 3.99232C3.35751 3.9906 3.02034 4.325 3.01863 4.73921L3.01248 6.22481C3.00392 8.29586 4.6759 9.98171 6.74695 9.99027L6.76245 9.99031H7V11.5H2.75C2.33579 11.5 2 11.8358 2 12.25C2 12.6642 2.33579 13 2.75 13H7V14.9923H6.76245L6.74695 14.9923C4.6759 15.0009 3.00392 16.6867 3.01248 18.7578L3.01863 20.2434C3.02034 20.6576 3.35751 20.992 3.77172 20.9903C4.18593 20.9886 4.52032 20.6514 4.51861 20.2372L4.51247 18.7516C4.50733 17.509 5.51052 16.4975 6.75315 16.4923L6.76245 16.4923H7.22633C7.86093 18.5251 9.75816 20.0005 12 20.0005C14.2418 20.0005 16.1391 18.5251 16.7737 16.4923H17.2375L17.2468 16.4923C18.4895 16.4975 19.4927 17.509 19.4875 18.7516L19.4814 20.2372C19.4797 20.6514 19.8141 20.9886 20.2283 20.9903C20.6425 20.992 20.9797 20.6576 20.9814 20.2434L20.9875 18.7578C20.9961 16.6867 19.3241 15.0009 17.253 14.9923L17.2375 14.9923H17V13H21.2514C21.6656 13 22.0014 12.6642 22.0014 12.25C22.0014 11.8358 21.6656 11.5 21.2514 11.5H17V9.99031H17.2375L17.253 9.99027C19.3241 9.98171 20.9961 8.29586 20.9875 6.2248L20.9814 4.73921C20.9797 4.325 20.6425 3.9906 20.2283 3.99232C19.8141 3.99403 19.4797 4.3312 19.4814 4.74541L19.4875 6.23101C19.4927 7.47364 18.4895 8.48515 17.2468 8.49029L17.2375 8.49031H16.9909C16.8849 6.96179 15.863 5.68546 14.4701 5.20644C14.8043 4.72267 15 4.13592 15 3.50345V2.75134C15 2.33713 14.6642 2.00134 14.25 2.00134C13.8358 2.00134 13.5 2.33713 13.5 2.75134V3.50345C13.5 4.33188 12.8284 5.00345 12 5.00345C11.1716 5.00345 10.5 4.33188 10.5 3.50345V2.75134ZM8.5 8.75348C8.5 7.51084 9.50736 6.50348 10.75 6.50348H13.25C14.4926 6.50348 15.5 7.51084 15.5 8.75348V15.0005C15.5 16.9335 13.933 18.5005 12 18.5005C10.067 18.5005 8.5 16.9335 8.5 15.0005V8.75348Z</StreamGeometry>
 
@@ -29,6 +30,7 @@
     <StreamGeometry x:Key="error_circle_regular">M12,2 C17.523,2 22,6.478 22,12 C22,17.522 17.523,22 12,22 C6.477,22 2,17.522 2,12 C2,6.478 6.477,2 12,2 Z M12,3.667 C7.405,3.667 3.667,7.405 3.667,12 C3.667,16.595 7.405,20.333 12,20.333 C16.595,20.333 20.333,16.595 20.333,12 C20.333,7.405 16.595,3.667 12,3.667 Z M11.9986626,14.5022358 C12.5502088,14.5022358 12.9973253,14.9493523 12.9973253,15.5008984 C12.9973253,16.0524446 12.5502088,16.4995611 11.9986626,16.4995611 C11.4471165,16.4995611 11,16.0524446 11,15.5008984 C11,14.9493523 11.4471165,14.5022358 11.9986626,14.5022358 Z M11.9944624,7 C12.3741581,6.99969679 12.6881788,7.28159963 12.7381342,7.64763535 L12.745062,7.7494004 L12.7486629,12.2509944 C12.7489937,12.6652079 12.4134759,13.0012627 11.9992625,13.0015945 C11.6195668,13.0018977 11.3055461,12.7199949 11.2555909,12.3539592 L11.2486629,12.2521941 L11.245062,7.7506001 C11.2447312,7.33638667 11.580249,7.00033178 11.9944624,7 Z</StreamGeometry>
 
     <StreamGeometry x:Key="filter_regular">M17.25,19 C17.6642136,19 18,19.3357864 18,19.75 C18,20.1642136 17.6642136,20.5 17.25,20.5 L10.75,20.5 C10.3357864,20.5 10,20.1642136 10,19.75 C10,19.3357864 10.3357864,19 10.75,19 L17.25,19 Z M21.25,13 C21.6642136,13 22,13.3357864 22,13.75 C22,14.1642136 21.6642136,14.5 21.25,14.5 L6.75,14.5 C6.33578644,14.5 6,14.1642136 6,13.75 C6,13.3357864 6.33578644,13 6.75,13 L21.25,13 Z M24.25,7 C24.6642136,7 25,7.33578644 25,7.75 C25,8.16421356 24.6642136,8.5 24.25,8.5 L3.75,8.5 C3.33578644,8.5 3,8.16421356 3,7.75 C3,7.33578644 3.33578644,7 3.75,7 L24.25,7 Z</StreamGeometry>
+    <StreamGeometry x:Key="folder_regular">M17.0606622,9 C17.8933043,9 18.7000032,9.27703406 19.3552116,9.78392956 L19.5300545,9.92783739 L22.116207,12.1907209 C22.306094,12.356872 22.5408581,12.4608817 22.7890575,12.4909364 L22.9393378,12.5 L40.25,12.5 C42.2542592,12.5 43.8912737,14.0723611 43.994802,16.0508414 L44,16.25 L44,35.25 C44,37.2542592 42.4276389,38.8912737 40.4491586,38.994802 L40.25,39 L7.75,39 C5.74574083,39 4.10872626,37.4276389 4.00519801,35.4491586 L4,35.25 L4,12.75 C4,10.7457408 5.57236105,9.10872626 7.55084143,9.00519801 L7.75,9 L17.0606622,9 Z M22.8474156,14.9988741 L20.7205012,17.6147223 C20.0558881,18.4327077 19.0802671,18.9305178 18.0350306,18.993257 L17.8100737,19 L6.5,18.999 L6.5,35.25 C6.5,35.8972087 6.99187466,36.4295339 7.62219476,36.4935464 L7.75,36.5 L40.25,36.5 C40.8972087,36.5 41.4295339,36.0081253 41.4935464,35.3778052 L41.5,35.25 L41.5,16.25 C41.5,15.6027913 41.0081253,15.0704661 40.3778052,15.0064536 L40.25,15 L22.8474156,14.9988741 Z M17.0606622,11.5 L7.75,11.5 C7.10279131,11.5 6.5704661,11.9918747 6.50645361,12.6221948 L6.5,12.75 L6.5,16.499 L17.8100737,16.5 C18.1394331,16.5 18.4534488,16.3701335 18.6858203,16.1419575 L18.7802162,16.0382408 L20.415,14.025 L17.883793,11.8092791 C17.693906,11.643128 17.4591419,11.5391183 17.2109425,11.5090636 L17.0606622,11.5 Z</StreamGeometry>
     <StreamGeometry x:Key="folder_open_regular">M20 9.50195V8.74985C20 7.50721 18.9926 6.49985 17.75 6.49985H12.0247L9.64368 4.51995C9.23959 4.18393 8.73063 3.99997 8.20509 3.99997H4.24957C3.00724 3.99997 2 5.00686 1.99957 6.24919L1.99561 17.7492C1.99518 18.9921 3.00266 20 4.24561 20H4.27196C4.27607 20 4.28019 20 4.28431 20H18.4693C19.2723 20 19.9723 19.4535 20.167 18.6745L21.9169 11.6765C22.1931 10.5719 21.3577 9.50195 20.2192 9.50195H20ZM4.24957 5.49997H8.20509C8.38027 5.49997 8.54993 5.56129 8.68462 5.6733L11.2741 7.82652C11.4088 7.93852 11.5784 7.99985 11.7536 7.99985H17.75C18.1642 7.99985 18.5 8.33563 18.5 8.74985V9.50195H6.42385C5.39136 9.50195 4.49137 10.2047 4.241 11.2064L3.49684 14.1837L3.49957 6.24971C3.49971 5.8356 3.83546 5.49997 4.24957 5.49997ZM5.69623 11.5701C5.77969 11.2362 6.07969 11.002 6.42385 11.002H20.2192C20.3819 11.002 20.5012 11.1548 20.4617 11.3126L18.7119 18.3107C18.684 18.4219 18.584 18.5 18.4693 18.5H4.28431C4.12167 18.5 4.00233 18.3472 4.04177 18.1894L5.69623 11.5701Z</StreamGeometry>
 
     <StreamGeometry x:Key="glasses_regular">M7.90885 5H9.24945C9.66366 5 9.99945 5.33579 9.99945 5.75C9.99945 6.1297 9.71729 6.44349 9.35122 6.49315L9.24945 6.5H7.90885C7.7339 6.5 7.56563 6.5611 7.4322 6.67094L7.35655 6.74259L5.283 8.999L8.74883 8.99956C9.90849 8.99956 10.8632 9.87687 10.9856 11.004H13.0132C13.1356 9.87687 14.0903 8.99956 15.25 8.99956L18.727 8.999L16.6438 6.74141C16.5254 6.61317 16.3669 6.53102 16.1962 6.5072L16.0925 6.5H14.7467C14.3325 6.5 13.9967 6.16421 13.9967 5.75C13.9967 5.3703 14.2789 5.05651 14.645 5.00685L14.7467 5H16.0925C16.6579 5 17.2 5.21269 17.6133 5.59178L17.7462 5.72424L21.3881 9.67141C21.4384 9.72588 21.479 9.78579 21.5101 9.84906C21.816 10.2334 21.9988 10.7201 21.9988 11.2496V14.7461C21.9988 16.541 20.5438 17.9961 18.7488 17.9961H16.25C14.4551 17.9961 13 16.541 13 14.7461L12.999 12.504H10.998L10.9988 14.7461C10.9988 16.541 9.54376 17.9961 7.74883 17.9961H5.25C3.45507 17.9961 2 16.541 2 14.7461V11.2496C2 10.6879 2.20576 10.1744 2.54602 9.78017L2.58382 9.72499L2.6277 9.67259L6.25196 5.72776C6.63545 5.31035 7.16059 5.05479 7.72092 5.00785L7.90885 5H9.24945H7.90885ZM8.74883 10.4996H4.25C3.83579 10.4996 3.5 10.8353 3.5 11.2496V14.7461C3.5 15.7126 4.2835 16.4961 5.25 16.4961H7.74883C8.71533 16.4961 9.49883 15.7126 9.49883 14.7461V11.2496C9.49883 10.8353 9.16305 10.4996 8.74883 10.4996ZM19.7488 10.4996H15.25C14.8358 10.4996 14.5 10.8353 14.5 11.2496V14.7461C14.5 15.7126 15.2835 16.4961 16.25 16.4961H18.7488C19.7153 16.4961 20.4988 15.7126 20.4988 14.7461V11.2496C20.4988 10.8353 20.163 10.4996 19.7488 10.4996Z</StreamGeometry>
diff --git a/Source/Main/MainWindow.axaml b/Source/Main/MainWindow.axaml
index d81cd63..e276cb7 100644
--- a/Source/Main/MainWindow.axaml
+++ b/Source/Main/MainWindow.axaml
@@ -8,6 +8,6 @@
         d:DesignHeight="600"
         Icon="/Assets/Icons/App.ico"
         x:Class="MQTTnetApp.Main.MainWindow"
-        Title="MQTT Multimeter (MQTTnet App)">
+        Title="mqttMultimeter">
     <main:MainView />
 </Window>
\ No newline at end of file
diff --git a/Source/Pages/Inflight/InflightPageItemView.axaml b/Source/Pages/Inflight/InflightPageItemView.axaml
index 1e916c6..f97ba9a 100644
--- a/Source/Pages/Inflight/InflightPageItemView.axaml
+++ b/Source/Pages/Inflight/InflightPageItemView.axaml
@@ -60,7 +60,7 @@
                                                       Grid.ColumnSpan="2"
                                                       Grid.Row="2"
                                                       Margin="0,10,0,0"
-                                                      Buffer="{Binding Payload}" />
+                                                      Buffer="{Binding Payload, Mode=TwoWay}" />
                     </Grid>
                 </TabItem>
 
diff --git a/Source/Pages/Inflight/InflightPageItemViewModel.cs b/Source/Pages/Inflight/InflightPageItemViewModel.cs
index 6cb0886..765ae5f 100644
--- a/Source/Pages/Inflight/InflightPageItemViewModel.cs
+++ b/Source/Pages/Inflight/InflightPageItemViewModel.cs
@@ -36,9 +36,7 @@ public InflightPageItemViewModel(MqttApplicationMessage message)
     public byte[] Payload => Message.Payload ?? Array.Empty<byte>();
 
     public MqttPayloadFormatIndicator PayloadFormatIndicator => Message.PayloadFormatIndicator;
-
-    public string PayloadPreview { get; set; } = string.Empty;
-
+    
     public MqttQualityOfServiceLevel QualityOfServiceLevel => Message.QualityOfServiceLevel;
 
     public string ResponseTopic => Message.ResponseTopic;
diff --git a/Source/Pages/Info/InfoPageView.axaml b/Source/Pages/Info/InfoPageView.axaml
index 0d8ae52..0f1091c 100644
--- a/Source/Pages/Info/InfoPageView.axaml
+++ b/Source/Pages/Info/InfoPageView.axaml
@@ -50,7 +50,7 @@
                            Height="82" />
                     <TextBlock FontSize="42"
                                Margin="0,20,0,0"
-                               Text="MQTTnet.App" />
+                               Text="mqttMultimeter" />
                 </StackPanel>
 
                 <!-- The buttons -->
@@ -96,18 +96,9 @@
                        Margin="0,20,0,0"
                        Content="Versions" />
 
-                <Grid Margin="10,0,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+                <Grid Margin="10,0,0,0"
+                      ColumnDefinitions="Auto,Auto,Auto"
+                      RowDefinitions="Auto,Auto,Auto,Auto">
 
                     <Label Classes="caption"
                            Grid.Column="0"
diff --git a/Source/Pages/Publish/PublishPageViewModel.cs b/Source/Pages/Publish/PublishPageViewModel.cs
index 8d7e5b2..37e25cf 100644
--- a/Source/Pages/Publish/PublishPageViewModel.cs
+++ b/Source/Pages/Publish/PublishPageViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using MQTTnetApp.Common;
 using MQTTnetApp.Pages.Inflight;
@@ -68,7 +69,7 @@ public void RepeatMessage(InflightPageItemViewModel inflightPageItem)
             Name = $"Repeat '{inflightPageItem.Topic}'",
             ContentType = inflightPageItem.ContentType,
             Topic = inflightPageItem.Topic,
-            Payload = inflightPageItem.PayloadPreview
+            Payload = Encoding.UTF8.GetString(inflightPageItem.Payload)
         };
 
         Items.Collection.Add(publishItem);
diff --git a/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs b/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs
index d2e7439..eb9877f 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs
+++ b/Source/Pages/TopicExplorer/TopicExplorerItemMessageViewModel.cs
@@ -28,7 +28,7 @@ public TopicExplorerItemMessageViewModel(DateTime timestamp, MqttApplicationMess
     public InflightPageItemViewModel InflightItem { get; init; }
 
     public string Payload { get; init; }
-    
+
     public int PayloadLength { get; }
 
     public bool Retain { get; }
diff --git a/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs b/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs
index e01a927..c5f1d84 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs
+++ b/Source/Pages/TopicExplorer/TopicExplorerItemViewModel.cs
@@ -15,6 +15,7 @@ public sealed class TopicExplorerItemViewModel : BaseViewModel
 
     string? _currentPayload;
     int _currentPayloadLength;
+    DateTime? _lastUpdateTimestamp;
     TopicExplorerItemMessageViewModel? _selectedMessage;
     int _totalPayloadLength;
     bool _trackLatestMessage;
@@ -44,6 +45,12 @@ public int CurrentPayloadLength
 
     public bool HasPayload => CurrentPayload != null;
 
+    public DateTime? LastUpdateTimestamp
+    {
+        get => _lastUpdateTimestamp;
+        private set => this.RaiseAndSetIfChanged(ref _lastUpdateTimestamp, value);
+    }
+
     public CollectionViewModel<TopicExplorerItemMessageViewModel> Messages { get; } = new();
 
     public TopicExplorerItemMessageViewModel? SelectedMessage
@@ -88,9 +95,11 @@ public void AddMessage(MqttApplicationMessage message)
             payload = string.Empty;
         }
 
+        var timestamp = DateTime.Now;
+
         TotalPayloadLength += message.Payload?.Length ?? 0;
+        LastUpdateTimestamp = timestamp;
 
-        var timestamp = DateTime.Now;
         var duration = TimeSpan.Zero;
         var lastMessage = Messages.LastOrDefault();
         if (lastMessage != null)
diff --git a/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml b/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml
index e0cc6bb..9248d1e 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml
+++ b/Source/Pages/TopicExplorer/TopicExplorerPageView.axaml
@@ -14,7 +14,7 @@
     <controls:Overlay IsOverlayVisible="{Binding Path=OverlayContent, Converter={x:Static ObjectConverters.IsNotNull}}"
                       OverlayContent="{Binding OverlayContent}">
 
-        <Grid ColumnDefinitions="*,Auto,*">
+        <Grid ColumnDefinitions="3*,Auto,2*">
 
             <!-- The tree of topics. -->
             <Grid Grid.Column="0"
@@ -65,6 +65,8 @@
 
                 <TreeView Background="Transparent"
                           Grid.Row="1"
+                          AutoScrollToSelectedItem="False"
+                          SelectionMode="Single"
                           x:Name="PART_Items"
                           SelectedItem="{Binding SelectedNode, Mode=TwoWay}"
                           Items="{Binding Nodes}"
diff --git a/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml b/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml
index 1ad5b04..1a23dc8 100644
--- a/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml
+++ b/Source/Pages/TopicExplorer/TopicExplorerTreeNodeView.axaml
@@ -9,46 +9,70 @@
              d:DataContext="{d:DesignInstance topicExplorer:TopicExplorerTreeNodeViewModel}"
              x:Class="MQTTnetApp.Pages.TopicExplorer.TopicExplorerTreeNodeView">
 
-    <StackPanel Orientation="Vertical" Margin="0,3">
+    <Grid RowDefinitions="Auto,Auto"
+          ColumnDefinitions="Auto,Auto,Auto"
+          Margin="0,3">
 
-        <StackPanel Orientation="Horizontal">
+        <PathIcon Grid.Column="0"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Width="16"
+                  Height="16"
+                  IsVisible="{Binding !Item.HasPayload}"
+                  Data="{StaticResource folder_regular}" />
+        
+        <PathIcon Grid.Column="0"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Width="16"
+                  Height="16"
+                  IsVisible="{Binding Item.HasPayload, FallbackValue=False}"
+                  Data="{StaticResource attach_regular}" />
 
-            <!-- The topic name -->
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Classes="code_text"
-                           Text="{Binding Name}" />
+        <!-- The topic name -->
+        <StackPanel Grid.Column="1"
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Margin="10,0,0,0"
+                    Orientation="Horizontal">
 
-                <TextBlock Text="="
-                           FontStyle="Italic"
-                           IsVisible="{Binding Item.HasPayload, FallbackValue=False}"
-                           Margin="10,0" />
-            </StackPanel>
-
-            <!-- The latest payload -->
             <TextBlock Classes="code_text"
-                       TextTrimming="CharacterEllipsis"
-                       TextWrapping="NoWrap"
-                       FontStyle="Italic"
-                       Text="{Binding Item.CurrentPayload, FallbackValue=''}" />
+                       Text="{Binding Name}" />
+
+            <TextBlock Text="="
+                       IsVisible="{Binding Item.HasPayload, FallbackValue=False}"
+                       Margin="10,0" />
         </StackPanel>
 
+        <!-- The latest payload -->
+        <TextBlock Grid.Column="2"
+                   Grid.Row="0"
+                   Classes="code_text"
+                   TextWrapping="NoWrap"
+                   Text="{Binding Item.CurrentPayload, FallbackValue=''}" />
+
         <!-- The statistics -->
-        <StackPanel TextBlock.Foreground="Gray" Orientation="Horizontal" Margin="0,3" IsVisible="{Binding !Item.Messages.IsEmpty, FallbackValue=False}">
-            <TextBlock Classes="code_text"
-                       FontSize="10"
-                       TextTrimming="CharacterEllipsis"
-                       Text="{Binding Path=Item.Messages.Count, StringFormat={}{0} messages, FallbackValue=0}" />
-            <TextBlock Text="," Margin="0,0,10,0" />
-            <TextBlock Classes="code_text"
-                       FontSize="10"
-                       TextTrimming="CharacterEllipsis"
-                       Text="{Binding Path=Item.CurrentPayloadLength, StringFormat={}{0} bytes (latest message), FallbackValue=0}" />
-            <TextBlock Text="," Margin="0,0,10,0" />
-            <TextBlock Classes="code_text"
-                       FontSize="10"
-                       TextTrimming="CharacterEllipsis"
-                       Text="{Binding Path=Item.TotalPayloadLength, StringFormat={}{0} bytes (all message), FallbackValue=0}" />
-        </StackPanel>
+        <StackPanel Grid.Column="2"
+                    Grid.Row="1"
+                    Orientation="Horizontal"
+                    Margin="0,3,0,0"
+                    IsVisible="{Binding !Item.Messages.IsEmpty, FallbackValue=False}">
 
-    </StackPanel>
+            <TextBlock Classes="code_text">
+                <TextBlock.Text>
+                    <MultiBinding StringFormat="{}Messages: {0} | Last received: {1:O} | Last bytes: {2} | Total bytes: {3}">
+                        <Binding Path="Item.Messages.Count"
+                                 FallbackValue="0" />
+                        <Binding Path="Item.LastUpdateTimestamp"
+                                 FallbackValue='' />
+                        <Binding Path="Item.CurrentPayloadLength"
+                                 FallbackValue="0" />
+                        <Binding Path="Item.TotalPayloadLength"
+                                 FallbackValue="0" />
+                    </MultiBinding>
+                </TextBlock.Text>
+            </TextBlock>
+
+        </StackPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file