diff --git a/src/components/RootLayout/styles.module.css b/src/components/RootLayout/styles.module.css
index a923444..a02a90b 100644
--- a/src/components/RootLayout/styles.module.css
+++ b/src/components/RootLayout/styles.module.css
@@ -8,7 +8,9 @@
 }
 .panelOuterContent {
   flex-grow: 1;
+  overflow-y: hidden;
 }
 .panelInnerContent {
   height: 100%;
+  overflow-y: auto;
 }
\ No newline at end of file
diff --git a/src/hooks/solace.jsx b/src/hooks/solace.jsx
index 356775d..9e496a9 100644
--- a/src/hooks/solace.jsx
+++ b/src/hooks/solace.jsx
@@ -122,8 +122,7 @@ class ReplayQueueBrowser {
 
     return messages.map((msg, n) => ({
       meta: msgMetaData[n],
-      payload: msg.getBinaryAttachment().toString(),
-      size: msg.getBinaryAttachment().length,
+      payload: msg.getSdtContainer()?.getValue() || msg.getBinaryAttachment().toString(),
       headers: {
         destination: msg.getDestination().getName(),
         replicationGroupMsgId: msg.getReplicationGroupMessageId().toString(),
@@ -334,7 +333,7 @@ class ForwardQueueBrowser {
 
     messages.forEach(msg => {
       const msgObj = {
-        payload: msg.getBinaryAttachment().toString(),
+        payload: msg.getSdtContainer()?.getValue() || msg.getBinaryAttachment().toString(),
         headers: {
           destination: msg.getDestination().getName(),
           replicationGroupMsgId: msg.getReplicationGroupMessageId().toString(),
@@ -509,7 +508,7 @@ class ReverseQueueBrowser {
 
     messages.forEach(msg => {
       const msgObj = {
-        payload: msg.getBinaryAttachment().toString(),
+        payload: msg.getSdtContainer()?.getValue() || msg.getBinaryAttachment().toString(),
         headers: {
           destination: msg.getDestination().getName(),
           replicationGroupMsgId: msg.getReplicationGroupMessageId().toString(),