diff --git a/gui/pages/Content/APM/ApmDashboard.js b/gui/pages/Content/APM/ApmDashboard.js
index 4a24fa3b5..a79dd3b3d 100644
--- a/gui/pages/Content/APM/ApmDashboard.js
+++ b/gui/pages/Content/APM/ApmDashboard.js
@@ -276,7 +276,7 @@ export default function ApmDashboard() {
                         <td className="table_data text_align_right w_12 br_left_grey">{formatNumber(run.total_tokens)}</td>
                         <td className="table_data text_align_right w_6 br_left_grey">{run.runs_completed}</td>
                         <td className="table_data text_align_right w_12 br_left_grey">
-                          {run.runs_completed ? (run.total_tokens / run.runs_completed).toFixed(1) : '-'}
+                          {run.runs_completed ? formatNumber((run.total_tokens / run.runs_completed).toFixed(1)) : '-'}
                         </td>
                         <td className="table_data text_align_right br_left_grey" style={{width: '20%'}}>
                           {run.tools_used && run.tools_used.slice(0, 3).map((tool, index) => (
diff --git a/gui/pages/Content/Marketplace/Market.js b/gui/pages/Content/Marketplace/Market.js
index bcfd49e7c..7d20b821a 100644
--- a/gui/pages/Content/Marketplace/Market.js
+++ b/gui/pages/Content/Marketplace/Market.js
@@ -36,16 +36,6 @@ export default function Market({env, getModels, sendModelData}) {
       }
     }
 
-    const handleOpenTemplateDetails = ({item, contentType}) => {
-      setLocalStorageValue('market_detail_type', contentType, setDetailType);
-      setLocalStorageArray('market_item', item, setTemplateData);
-      setLocalStorageValue('market_item_clicked', true, setItemClicked);
-    };
-
-    const handleBackClick = () => {
-      setLocalStorageValue('market_item_clicked', false, setItemClicked);
-    }
-
     EventBus.on('openTemplateDetails', handleOpenTemplateDetails);
     EventBus.on('goToMarketplace', handleBackClick);
 
@@ -60,44 +50,67 @@ export default function Market({env, getModels, sendModelData}) {
     localStorage.setItem('marketplace_tab', tab);
   };
 
+  const tabData = [
+    { id: 'market_tools', label: 'Tools', image: '/images/tools_light.svg' },
+    { id: 'market_knowledge', label: 'Knowledge', image: '/images/knowledge.svg' },
+    { id: 'market_agents', label: 'Agent Templates', image: '/images/agents_light.svg' },
+    { id: 'market_models', label: 'Models', image: '/images/models.svg' },
+  ];
+
+  const renderTab = (tab) => {
+    return (
+        <button
+            key={tab.id}
+            onClick={() => switchTab(tab.id)}
+            className={activeTab === tab.id ? 'tab_button_selected' : 'tab_button'}
+        >
+          <Image width={14} height={14} src={tab.image} alt={`${tab.label}-icon`} />
+          <span>{tab.label}</span>
+        </button>
+    );
+  };
+
+  const handleOpenTemplateDetails = ({ item, contentType }) => {
+    localStorage.setItem('market_detail_type', contentType);
+    setDetailType(contentType);
+    localStorage.setItem('market_item', JSON.stringify(item));
+    setTemplateData(item);
+    localStorage.setItem('market_item_clicked', true);
+    setItemClicked(true);
+  };
+
+  const handleBackClick = () => {
+    localStorage.setItem('market_item_clicked', false);
+    setItemClicked(false);
+  };
+
   return (
-    <div>
-      {!itemClicked ? <div className={styles.empty_state}>
-        <div style={{width: '100%', display: 'flex', flexDirection: 'column'}}>
-          <div className={styles.detail_top}>
-            <div style={{display: 'flex', overflowX: 'scroll', marginLeft: '8px'}}>
-              <button onClick={() => switchTab('market_tools')} className={activeTab === 'market_tools' ? 'tab_button_selected' : 'tab_button'}>
-                <Image width={14} height={14} src="/images/tools_light.svg" alt="tools-icon"/>
-                <span>Tools</span>
-              </button>
-              <button onClick={() => switchTab('market_knowledge')} className={activeTab === 'market_knowledge' ? 'tab_button_selected' : 'tab_button'}>
-                <Image width={14} height={14} src="/images/knowledge.svg" alt="knowledge-icon"/>
-                <span>Knowledge</span>
-              </button>
-              <button onClick={() => switchTab('market_agents')} className={activeTab === 'market_agents' ? 'tab_button_selected' : 'tab_button'}>
-                <Image width={14} height={14} src="/images/agents_light.svg" alt="agent-template-icon"/>
-                <span>Agent Templates</span>
-              </button>
-              <button onClick={() => switchTab('market_models')} className={activeTab === 'market_models' ? 'tab_button_selected' : 'tab_button'}>
-                <Image width={14} height={14} src="/images/models.svg" alt="model-template-icon"/>
-                <span>Models</span>
-              </button>
+      <div>
+        {!itemClicked ? (
+            <div className={styles.empty_state}>
+              <div style={{ width: '100%', display: 'flex', flexDirection: 'column' }}>
+                <div className={styles.detail_top}>
+                  <div style={{ display: 'flex', overflowX: 'scroll', marginLeft: '8px' }}>
+                    {tabData.map(renderTab)}
+                  </div>
+                </div>
+                <div>
+                  {activeTab === 'market_tools' && <MarketTools />}
+                  {activeTab === 'market_knowledge' && <MarketKnowledge />}
+                  {activeTab === 'market_agents' && <MarketAgent />}
+                  {activeTab === 'market_models' && <MarketModels />}
+                </div>
+              </div>
+            </div>
+        ) : (
+            <div style={{padding: '0 3px'}}>
+              {detailType === 'agent_template' && <AgentTemplate env={env} template={templateData}/>}
+              {detailType === 'knowledge_template' && <KnowledgeTemplate env={env} template={templateData}/>}
+              {detailType === 'tool_template' && <ToolkitTemplate env={env} template={templateData}/>}
+              {detailType === 'model_template' && <ModelTemplate env={env} template={templateData} getModels={getModels} sendModelData={sendModelData} />}
             </div>
-          </div>
-          <div>
-            {activeTab === 'market_tools' && <MarketTools/>}
-            {activeTab === 'market_knowledge' && <MarketKnowledge/>}
-            {activeTab === 'market_agents' && <MarketAgent/>}
-            {activeTab === 'market_models' && <MarketModels/>}
-          </div>
-        </div>
-      </div> : <div style={{padding: '0 3px'}}>
-        {detailType === 'agent_template' && <AgentTemplate env={env} template={templateData}/>}
-        {detailType === 'knowledge_template' && <KnowledgeTemplate env={env} template={templateData}/>}
-        {detailType === 'tool_template' && <ToolkitTemplate env={env} template={templateData}/>}
-        {detailType === 'model_template' && <ModelTemplate env={env} template={templateData} getModels={getModels} sendModelData={sendModelData} />}
-      </div>}
-    </div>
+        )}
+      </div>
   );
-};
+}
 
diff --git a/gui/pages/Dashboard/SideBar.js b/gui/pages/Dashboard/SideBar.js
index d57843f01..e13989a2b 100644
--- a/gui/pages/Dashboard/SideBar.js
+++ b/gui/pages/Dashboard/SideBar.js
@@ -34,7 +34,7 @@ export default function SideBar({onSelectEvent, env}) {
                         <div className={styles.button_icon}>
                             <Image width={17} height={17} src={section.icon} alt={`${section.name}-icon`}/>
                         </div>
-                        <div>{section.name.charAt(0).toUpperCase() + section.name.slice(1)}</div>
+                        {section.name === 'apm' ? <div>APM</div> : <div>{section.name.charAt(0).toUpperCase() + section.name.slice(1)}</div>}
                     </div>
                 </div>
             ))}