diff --git a/src/App.tsx b/src/App.tsx
index b933d0b..fc385a3 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -281,7 +281,7 @@ function App() {
         return <AgentsPanel onOpenChange={() => setCurrentView("providers")} />;
       default:
         return (
-          <div className="mx-auto max-w-4xl space-y-4">
+          <div className="mx-auto max-w-[60rem] px-6 space-y-4">
             <ProviderList
               providers={providers}
               currentProviderId={currentProviderId}
@@ -339,13 +339,13 @@ function App() {
       )}
 
       <header
-        className="glass-header fixed top-0 z-50 w-full px-6 py-3 transition-all duration-300"
+        className="glass-header fixed top-0 z-50 w-full py-3 transition-all duration-300"
         data-tauri-drag-region
         style={{ WebkitAppRegion: "drag" } as any}
       >
         <div className="h-4 w-full" aria-hidden data-tauri-drag-region />
         <div
-          className="flex flex-wrap items-center justify-between gap-2"
+          className="mx-auto max-w-[60rem] px-6 flex flex-wrap items-center justify-between gap-2"
           data-tauri-drag-region
           style={{ WebkitAppRegion: "drag" } as any}
         >
@@ -375,7 +375,7 @@ function App() {
               </div>
             ) : (
               <>
-                <div className="flex items-center gap-2 pl-1 sm:pl-2">
+                <div className="flex items-center gap-2">
                   <a
                     href="https://github.com/farion1231/cc-switch"
                     target="_blank"
@@ -509,7 +509,7 @@ function App() {
       </header>
 
       <main
-        className={`flex-1 overflow-y-auto pb-12 px-6 animate-fade-in scroll-overlay ${currentView === "providers" ? "pt-24" : "pt-20"
+        className={`flex-1 overflow-y-auto pb-12 animate-fade-in scroll-overlay ${currentView === "providers" ? "pt-24" : "pt-20"
           }`}
         style={{ overflowX: "hidden" }}
       >
diff --git a/src/components/prompts/PromptPanel.tsx b/src/components/prompts/PromptPanel.tsx
index 90e2919..f07bf2e 100644
--- a/src/components/prompts/PromptPanel.tsx
+++ b/src/components/prompts/PromptPanel.tsx
@@ -80,8 +80,8 @@ const PromptPanel = React.forwardRef<PromptPanelHandle, PromptPanelProps>(
     const enabledPrompt = promptEntries.find(([_, p]) => p.enabled);
 
     return (
-      <div className="mx-auto max-w-5xl flex flex-col h-[calc(100vh-8rem)]">
-        <div className="flex-shrink-0 px-6 py-4 glass rounded-xl border border-white/10 mb-4">
+      <div className="mx-auto max-w-[60rem] flex flex-col h-[calc(100vh-8rem)] px-6">
+        <div className="flex-shrink-0 py-4 glass rounded-xl border border-white/10 mb-4 px-6">
           <div className="text-sm text-muted-foreground">
             {t("prompts.count", { count: promptEntries.length })} ·{" "}
             {enabledPrompt
@@ -90,7 +90,7 @@ const PromptPanel = React.forwardRef<PromptPanelHandle, PromptPanelProps>(
           </div>
         </div>
 
-        <div className="flex-1 overflow-y-auto px-6 pb-16">
+        <div className="flex-1 overflow-y-auto pb-16">
           {loading ? (
             <div className="text-center py-12 text-gray-500 dark:text-gray-400">
               {t("prompts.loading")}