diff --git a/frontend/src/components/chat/MessageBubble.tsx b/frontend/src/components/chat/MessageBubble.tsx
index 4bf7c05..37fa3db 100644
--- a/frontend/src/components/chat/MessageBubble.tsx
+++ b/frontend/src/components/chat/MessageBubble.tsx
@@ -48,20 +48,20 @@ export function MessageBubble({ message }: MessageBubbleProps) {
         </div>
         
         {(message.plots || message.plot_ids) && ((message.plots?.length || 0) > 0 || (message.plot_ids?.length || 0) > 0) && (
-          <div className="mt-4 grid grid-cols-1 gap-2">
+          <div className="mt-4 grid grid-cols-1 gap-4">
             {message.plots?.map((plot, index) => {
               const src = `data:image/png;base64,${plot}`
               return (
                 <Button
                   key={`stream-${index}`}
                   variant="ghost"
-                  className="relative group p-0 h-auto w-full overflow-hidden hover:bg-transparent"
+                  className="relative group p-0 h-auto w-full max-w-2xl mx-auto overflow-hidden hover:bg-transparent flex justify-center border bg-white"
                   onClick={() => setSelectedPlot(src)}
                 >
                   <img
                     src={src}
                     alt="Analysis Plot"
-                    className="rounded-md border bg-white w-full h-auto transition-all group-hover:brightness-95"
+                    className="rounded-md max-h-[400px] w-auto object-contain transition-all group-hover:brightness-95"
                   />
                   <div className="absolute inset-0 flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity bg-black/10">
                     <Maximize2Icon className="h-6 w-6 text-white drop-shadow-md" />
@@ -75,13 +75,13 @@ export function MessageBubble({ message }: MessageBubbleProps) {
                 <Button
                   key={`history-${index}`}
                   variant="ghost"
-                  className="relative group p-0 h-auto w-full overflow-hidden hover:bg-transparent"
+                  className="relative group p-0 h-auto w-full max-w-2xl mx-auto overflow-hidden hover:bg-transparent flex justify-center border bg-white"
                   onClick={() => setSelectedPlot(src)}
                 >
                   <img
                     src={src}
                     alt="Historical Analysis Plot"
-                    className="rounded-md border bg-white w-full h-auto transition-all group-hover:brightness-95"
+                    className="rounded-md max-h-[400px] w-auto object-contain transition-all group-hover:brightness-95"
                   />
                   <div className="absolute inset-0 flex items-center justify-center opacity-0 group-hover:opacity-100 transition-opacity bg-black/10">
                     <Maximize2Icon className="h-6 w-6 text-white drop-shadow-md" />