diff --git a/src/lib/common/markdown/Markdown.svelte b/src/lib/common/markdown/Markdown.svelte
index 40655858..8c95e9ea 100644
--- a/src/lib/common/markdown/Markdown.svelte
+++ b/src/lib/common/markdown/Markdown.svelte
@@ -16,6 +16,9 @@
 
     let innerText = '';
 	$: {
+		if (typeof text !== 'string') {
+			text = `${JSON.stringify(text)}`;
+		}
 		const markedText = !rawText ? replaceNewLine(marked(replaceMarkdown(text || ''))?.toString()) : marked(text || '')?.toString();
 		if (!!markedText && markedText.endsWith('<br>')) {
 			const idx = markedText.lastIndexOf('<br>');
diff --git a/src/lib/helpers/types/instructTypes.js b/src/lib/helpers/types/instructTypes.js
index ee8ea9f3..21eb8b8a 100644
--- a/src/lib/helpers/types/instructTypes.js
+++ b/src/lib/helpers/types/instructTypes.js
@@ -33,6 +33,7 @@
  * @property {string} provider
  * @property {string} model
  * @property {string?} [template_name]
+ * @property {string?} [user_name]
  * @property {string} user_message
  * @property {string?} [system_instruction]
  * @property {string} completion_text
diff --git a/src/lib/scss/custom/pages/_instruction.scss b/src/lib/scss/custom/pages/_instruction.scss
index f80a81a5..0e0789f7 100644
--- a/src/lib/scss/custom/pages/_instruction.scss
+++ b/src/lib/scss/custom/pages/_instruction.scss
@@ -95,6 +95,7 @@
     padding: 10px 5px;
 
     .instruction-log-message {
+        margin-top: 10px;
         overflow-y: auto;
         max-height: 350px;
         scrollbar-width: none;
diff --git a/src/routes/page/conversation/+page.svelte b/src/routes/page/conversation/+page.svelte
index 78564da7..bd381b97 100644
--- a/src/routes/page/conversation/+page.svelte
+++ b/src/routes/page/conversation/+page.svelte
@@ -374,8 +374,12 @@
 				</div>
 			</CardBody>
 			{#if showStateSearch}
-				<CardBody class="border-bottom" style="display: flex; justify-content: flex-end;">
-					<StateSearch bind:states={states} onSearch={q => handleStateSearch(q)}/>
+				<CardBody class="border-bottom">
+					<Row class="g-3 justify-content-end">
+						<Col lg="6">
+							<StateSearch bind:states={states} onSearch={q => handleStateSearch(q)}/>
+						</Col>
+					</Row>
 				</CardBody>
 			{/if}
 			<CardBody class="border-bottom">
diff --git a/src/routes/page/conversation/state-search.svelte b/src/routes/page/conversation/state-search.svelte
index 7296ae1f..87480b56 100644
--- a/src/routes/page/conversation/state-search.svelte
+++ b/src/routes/page/conversation/state-search.svelte
@@ -36,7 +36,7 @@
 >
     {#each states as state, idx}
         <div class="state-search-item">
-            <div>
+            <div style="flex: 1;">
                 <RemoteSearchInput
                     bind:value={state.key}
                     maxLength={maxLength}
@@ -44,7 +44,7 @@
                     placeholder="Search States"
                 />
             </div>
-            <div>
+            <div style="flex: 1;">
                 <Input
                     type="text"
                     bind:value={state.value}
@@ -67,15 +67,16 @@
         </div>
     {/each}
     {#if states.length < limit}
-    <div>
-        <Button 
-            color="link"
-            style="padding-left: 0px;"
-            on:click={() => addState()}
-        >
-            Add +
-        </Button>
-    </div>
+        <div class="d-flex justify-content-end">
+            <Button 
+                color="link"
+                style="padding-left: 0px;"
+                on:click={() => addState()}
+            >
+                Add +
+            </Button>
+            <div style="flex: 0 0 13px;"></div>
+        </div>
     {/if}
 </div>
 
diff --git a/src/routes/page/instruction/log/+page.svelte b/src/routes/page/instruction/log/+page.svelte
index 0410ca33..2e0187c2 100644
--- a/src/routes/page/instruction/log/+page.svelte
+++ b/src/routes/page/instruction/log/+page.svelte
@@ -201,7 +201,7 @@
 
 
 <HeadTitle title="{$_('Instruction Log')}" />
-<Breadcrumb pagetitle="{$_('Instruction Log')}" title="{$_('Instruction')}"/>
+<Breadcrumb pagetitle="{$_('Log')}" title="{$_('Instruction')}"/>
 <LoadingToComplete isLoading={isLoading} />
 
 <Row>
@@ -260,9 +260,10 @@
 						<thead>
 							<tr>
 								<th scope="col" class="instruction-log-col ellipsis">{$_('Agent')}</th>
-								<th scope="col" class="instruction-log-col ellipsis">{$_('Provider')}</th>
-								<th scope="col" class="instruction-log-col ellipsis">{$_('Model')}</th>
+								<th scope="col" class="instruction-log-col ellipsis">{$_('Llm Provider')}</th>
+								<th scope="col" class="instruction-log-col ellipsis">{$_('Llm Model')}</th>
 								<th scope="col" class="instruction-log-col ellipsis">{$_('Template')}</th>
+								<th scope="col" class="instruction-log-col ellipsis">{$_('Caller')}</th>
                                 <th scope="col" class="instruction-log-col ellipsis">{$_('Created Time')}</th>
 								<th scope="col">{$_('')}</th>
 							</tr>
diff --git a/src/routes/page/instruction/log/log-item.svelte b/src/routes/page/instruction/log/log-item.svelte
index b04a8312..da4f5c3f 100644
--- a/src/routes/page/instruction/log/log-item.svelte
+++ b/src/routes/page/instruction/log/log-item.svelte
@@ -20,6 +20,7 @@
     <td class="instruction-log-col ellipsis">{item.provider}</td>
     <td class="instruction-log-col ellipsis">{item.model}</td>
     <td class="instruction-log-col ellipsis">{item.template_name || 'N/A'}</td>
+    <td class="instruction-log-col ellipsis">{item.user_name || 'N/A'}</td>
     <td class="instruction-log-col ellipsis">{utcToLocal(item.created_time)}</td>
     <td>
         <ul class="list-unstyled hstack gap-1 mb-0" style="justify-content: center;">
diff --git a/src/routes/page/instruction/+page.svelte b/src/routes/page/instruction/testing/+page.svelte
similarity index 97%
rename from src/routes/page/instruction/+page.svelte
rename to src/routes/page/instruction/testing/+page.svelte
index af0e8011..cbc0cc7e 100644
--- a/src/routes/page/instruction/+page.svelte
+++ b/src/routes/page/instruction/testing/+page.svelte
@@ -8,7 +8,7 @@
 	import HeadTitle from '$lib/common/HeadTitle.svelte';
     import Breadcrumb from '$lib/common/Breadcrumb.svelte';
 	import Markdown from '$lib/common/markdown/Markdown.svelte';
-	import InstructionState from './instruction-components/instruction-state.svelte';
+	import InstructionState from '../instruction-components/instruction-state.svelte';
 	import { getAgents } from '$lib/services/agent-service';
 	import LoadingToComplete from '$lib/common/LoadingToComplete.svelte';
 	import { sendChatCompletion } from '$lib/services/instruct-service';
@@ -16,8 +16,8 @@
 	import { LlmModelType } from '$lib/helpers/enums';
 	import NavBar from '$lib/common/nav-bar/NavBar.svelte';
 	import NavItem from '$lib/common/nav-bar/NavItem.svelte';
-	import InstructionTemplate from './instruction-components/instruction-template.svelte';
-	import InstructionLlm from './instruction-components/instruction-llm.svelte';
+	import InstructionTemplate from '../instruction-components/instruction-template.svelte';
+	import InstructionLlm from '../instruction-components/instruction-llm.svelte';
 
     const maxLength = 64000;
     const DEFAULT_PROVIDER = 'openai';
@@ -165,7 +165,7 @@
 </script>
 
 <HeadTitle title="{$_('Instruction')}" />
-<Breadcrumb pagetitle="{$_('Instruction')}" title="{$_('Instruction')}"/>
+<Breadcrumb pagetitle="{$_('Testing')}" title="{$_('Instruction')}"/>
 <LoadingToComplete isLoading={isLoading} />
 
 <div class="d-xl-flex">
diff --git a/svelte.config.js b/svelte.config.js
index a5e89ad7..03780c3c 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -52,7 +52,7 @@ const config = {
 				"/page/agent/[agentId]",
 				"/page/agent/[agentId]/build",
 				"/page/agent/[agentId]/train",
-				"/page/instruction",
+				"/page/instruction/testing",
 				"/page/instruction/log",
 				"/page/conversation",
 				"/page/conversation/[conversationId]",