diff --git a/src/components/message-item.tsx b/src/components/message-item.tsx
index c5440d7c..cc6e1fc0 100644
--- a/src/components/message-item.tsx
+++ b/src/components/message-item.tsx
@@ -99,7 +99,6 @@ export default function MessageItem(props: MessageItemProps) {
           </Show>
         </div>
         <div class="flex items-center gap-2">
-          <span class="text-[11px] text-[var(--text-muted)]">{timestamp()}</span>
           <Show when={isUser() && props.onRevert}>
             <button
               class="bg-transparent border border-[var(--border-base)] text-[var(--text-muted)] cursor-pointer px-3 py-0.5 rounded text-xs font-semibold leading-none transition-all duration-200 flex items-center justify-center h-6 hover:bg-[var(--surface-hover)] hover:border-[var(--accent-primary)] hover:text-[var(--accent-primary)] active:scale-95"
@@ -120,9 +119,10 @@ export default function MessageItem(props: MessageItemProps) {
               Fork
             </button>
           </Show>
+          <span class="text-[11px] text-[var(--text-muted)]">{timestamp()}</span>
         </div>
       </div>
- 
+
       <div class="pt-1 whitespace-pre-wrap break-words leading-[1.1]">
 
         <Show when={props.isQueued && isUser()}>
diff --git a/src/styles/components.css b/src/styles/components.css
index 907ad8e0..06442aed 100644
--- a/src/styles/components.css
+++ b/src/styles/components.css
@@ -846,7 +846,7 @@ button.button-primary:disabled {
 
 /* Tool call component */
 .tool-call {
-  @apply border rounded-md overflow-hidden;
+  @apply border overflow-hidden;
   border-color: var(--border-base);
   color: inherit;
   --tool-call-line-unit: 1.4em;
@@ -867,6 +867,7 @@ button.button-primary:disabled {
   @apply flex items-center gap-2 p-2 w-full bg-transparent border-none cursor-pointer text-left;
   font-family: var(--font-family-mono);
   font-size: 13px;
+  border-radius: 0;
 }
 
 .tool-call-header:hover {
@@ -1084,7 +1085,7 @@ button.button-primary:disabled {
   margin: 0;
   padding: 8px;
   background-color: var(--surface-base);
-  border-radius: 4px;
+  border-radius: 0px;
   overflow-x: auto;
   max-height: var(--tool-call-max-height-compact, calc(25 * 1.4em));
   overflow-y: scroll;
@@ -1104,12 +1105,12 @@ button.button-primary:disabled {
 
 .tool-call-section pre::-webkit-scrollbar-track {
   background: var(--surface-secondary);
-  border-radius: 4px;
+  border-radius: 0px;
 }
 
 .tool-call-section pre::-webkit-scrollbar-thumb {
   background: var(--border-base);
-  border-radius: 4px;
+  border-radius: 0px;
 }
 
 .tool-call-section pre::-webkit-scrollbar-thumb:hover {
@@ -1151,7 +1152,7 @@ button.button-primary:disabled {
 .tool-call-content {
   background-color: var(--surface-secondary);
   border: 1px solid var(--border-base);
-  border-radius: 4px;
+  border-radius: 0;
   padding: 8px 12px;
   font-family: var(--font-family-mono);
   font-size: var(--font-size-xs);
diff --git a/src/styles/markdown.css b/src/styles/markdown.css
index a3a15810..dbeea6dd 100644
--- a/src/styles/markdown.css
+++ b/src/styles/markdown.css
@@ -189,8 +189,8 @@
     padding: 4px 8px;
     background-color: var(--surface-secondary);
     border-bottom: 1px solid var(--border-base);
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
+    /* border-top-left-radius: 6px;
+    border-top-right-radius: 6px; */
   }
 
   .code-block-language {
@@ -236,8 +236,7 @@
     padding: 12px !important;
     overflow-x: auto;
     background-color: transparent !important;
-    border-bottom-left-radius: 6px;
-    border-bottom-right-radius: 6px;
+    border-radius: 0;
   }
 
   .markdown-code-block code {