diff --git a/src/lib/common/shared/Label.svelte b/src/lib/common/shared/Label.svelte
index e9d30b8b..792763eb 100644
--- a/src/lib/common/shared/Label.svelte
+++ b/src/lib/common/shared/Label.svelte
@@ -4,6 +4,8 @@
     export let text = "";
     export let className = "";
     export let style = "";
+    export let color = "primary";
+    export let ellipsis = false;
     /** @type {string | number} */
     export let index;
     /** @type {(args0: number | string) => void} */
@@ -20,9 +22,9 @@
 </script>
 
 <div class={`label-container ${className}`} style={`${style}`}>
-    <button class="btn btn-primary btn-sm label-btn">
+    <button class={`btn btn-${color} btn-sm label-btn`}>
         <div style="display: flex;">
-            <span class="d-none d-sm-inline-block me-2 label-text">
+            <span class={`me-2 label-text ${ellipsis ? 'label-ellipsis' : 'd-none d-sm-inline-block'}`}>
                 {text}
             </span>
             <i
@@ -55,6 +57,13 @@
         text-align: left;
     }
 
+    .label-ellipsis {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width: 120px;
+    }
+
     .label-close {
         cursor: pointer;
         display: flex;
diff --git a/src/lib/helpers/http.js b/src/lib/helpers/http.js
index c03bb81c..b86029f8 100644
--- a/src/lib/helpers/http.js
+++ b/src/lib/helpers/http.js
@@ -349,7 +349,7 @@ export function replaceNewLine(text) {
  * @returns {string}
  */
 export function replaceMarkdown(text) {
-    let res = text.replace(/#([\s]+)/g, '\\# ').replace(/[-|=]{3,}/g, '@@@');
+    let res = text.replace(/#([\s]+)/g, '\\# ').replace(/^-\s*/gm, '• ').replace(/[-|=]{3,}/g, '•••');
 
     let regex1 = new RegExp('\\*(.*)\\*', 'g');
     let regex2 = new RegExp('\\*([\\*]+)\\*', 'g');
diff --git a/src/lib/scss/custom/components/_markdown.scss b/src/lib/scss/custom/components/_markdown.scss
index 321fdd9c..e849c58e 100644
--- a/src/lib/scss/custom/components/_markdown.scss
+++ b/src/lib/scss/custom/components/_markdown.scss
@@ -42,7 +42,7 @@
     }
   
     ul {
-      list-style-position: inside !important;
+      list-style-position: outside !important;
     }
 }
   
diff --git a/src/lib/scss/custom/pages/_chat.scss b/src/lib/scss/custom/pages/_chat.scss
index f5b62fa3..67d86ae2 100644
--- a/src/lib/scss/custom/pages/_chat.scss
+++ b/src/lib/scss/custom/pages/_chat.scss
@@ -829,16 +829,14 @@
     display: flex;
     flex-wrap: wrap;
     overflow-y: auto;
-    scrollbar-width: none;
+    scrollbar-width: thin;
     min-height: 80px;
     max-height: 180px;
+}
 
-    .conv-tag-unit {
-        flex: 0 0 50%;
-        
-        label {
-            font-size: 14px;
-            font-weight: 400;
-        }
-    }
+.conv-tag-add {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-top: 10px;
 }
\ No newline at end of file
diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
index 9de26180..093711f9 100644
--- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
+++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
@@ -13,8 +13,7 @@
 		Dropdown,
 		DropdownToggle,
 		DropdownMenu,
-		DropdownItem,
-		Input
+		DropdownItem
 	} from '@sveltestrap/sveltestrap';
 	import {
 		conversationStore,
@@ -56,6 +55,7 @@
 	import LoadingToComplete from '$lib/common/spinners/LoadingToComplete.svelte';
 	import AudioSpeaker from '$lib/common/audio-player/AudioSpeaker.svelte';
 	import CodeScript from '$lib/common/shared/CodeScript.svelte';
+	import Label from '$lib/common/shared/Label.svelte';
 	import { realtimeChat } from '$lib/services/realtime-chat-service';
 	import { webSpeech } from '$lib/services/web-speech';
 	import LocalStorageManager from '$lib/helpers/utils/storage-manager';
@@ -64,7 +64,7 @@
 	import { utcToLocal } from '$lib/helpers/datetime';
 	import { replaceNewLine } from '$lib/helpers/http';
 	import { isAudio, isExcel, isPdf } from '$lib/helpers/utils/file';
-	import { ChatAction, ConversationTag, EditorType, FileSourceType, RichType, SenderAction, UserRole } from '$lib/helpers/enums';
+	import { ChatAction, EditorType, FileSourceType, RichType, SenderAction, UserRole } from '$lib/helpers/enums';
 	import ChatTextArea from './chat-util/chat-text-area.svelte';
 	import RichContent from './rich-content/rich-content.svelte';
 	import RcMessage from "./rich-content/rc-message.svelte";
@@ -131,12 +131,9 @@
 	/** @type {string[]} */
 	let chatUtilOptions = [];
 	/** @type {string[]} */
-	let selectedTags = [];
+	let convTags = [];
+	let newTagText = '';
 
-	/** @type {import('$commonTypes').KeyValuePair[]} */
-	let tagOptions = Object.entries(ConversationTag).map(([k, v]) => (
-		{ key: k, value: v }
-	));
 	
 	/** @type {any[]} */
     let scrollbars = [];
@@ -239,7 +236,8 @@
 		conversation = await getConversation(params.conversationId, true);
 		dialogs = await getDialogs(params.conversationId, dialogCount);
 		conversationUser = conversation?.user;
-		selectedTags = conversation?.tags || [];
+		convTags = conversation?.tags || [];
+
 		latestStateLog = conversation?.states;
 		initUserSentMessages(dialogs);
 		initChatView();
@@ -1409,44 +1407,55 @@
 	function toggleTagModal() {
 		isOpenTagModal = !isOpenTagModal;
 		if (!isOpenTagModal) {
-			selectedTags = conversation?.tags || [];
+			newTagText = '';
+			convTags = conversation?.tags || [];
 		}
 	}
 
-	/**
-	 * @param {any} e
-	 * @param {string} value
-	 */
-	function changeTagSelection(e, value) {
-		const checked = e.target.checked;
-		if (checked) {
-			selectedTags = [...new Set([...selectedTags, value])];
-		} else {
-			selectedTags = selectedTags.filter(x => x !== value);
+	/** @param {number | string} idx */
+	function removeTag(idx) {
+		const tag = convTags?.[/** @type {number} */ (idx)];
+		if (!tag) return;
+		convTags = convTags.filter(t => t !== tag);
+	}
+
+	function addTag() {
+		const tag = _.trim(newTagText);
+		if (!tag || convTags.includes(tag)) {
+			return;
 		}
+		convTags = [...convTags, tag];
+		newTagText = '';
 	}
 
 	function updateChatTags() {
+		const originalTags = conversation?.tags || [];
+		const toAddTags = convTags.filter(t => !originalTags.includes(t));
+		const toDeleteTags = originalTags.filter((/** @type {string} */ t) => !convTags.includes(t));
+
+		if (toAddTags.length === 0 && toDeleteTags.length === 0) {
+			isOpenTagModal = false;
+			return;
+		}
+
 		isLoading = true;
 		updateConversationTags(
 			params.conversationId,
-			{
-				toAddTags: selectedTags,
-				toDeleteTags: tagOptions.filter(x => !selectedTags.includes(x.value)).map(x => x.value)
-			})
+			{ toAddTags, toDeleteTags })
 		.then(res => {
 			if (res) {
+				conversation.tags = [...convTags];
 				isComplete = true;
-				successText = "Tags has been updated!";
+				successText = "Tags have been updated!";
 				setTimeout(() => {
 					isComplete = false;
 					successText = "";
 				}, duration);
 			} else {
-				throw "Failed to update chat tags.";
+				throw "Failed to update tags.";
 			}
 		}).catch(() => {
-			selectedTags = conversation?.tags || [];
+			convTags = conversation?.tags || [];
 			isError = true;
 			errorText = "Failed to update tags!";
 			setTimeout(() => {
@@ -1567,23 +1576,38 @@
 	closeable
 	toggleModal={() => toggleTagModal()}
 	confirmBtnText={'Confirm'}
-	cancelBtnText={'Cancel'}
+	cancelBtnText={''}
 	confirm={() => updateChatTags()}
-	cancel={() => toggleTagModal()}
 	close={() => toggleTagModal()}
 >
 	<div class="conv-tags-container">
-		{#each tagOptions as op}
-			<div class="conv-tag-unit">
-				<Input
-					type="checkbox"
-					label={op.value}
-					checked={selectedTags.includes(op.value)}
-					on:change={e => changeTagSelection(e, op.value)}
-				/>
-			</div>
+		{#each convTags as tag, idx}
+			<Label
+				text={tag}
+				index={idx}
+				color="info"
+				ellipsis
+				onClose={removeTag}
+			/>
 		{/each}
 	</div>
+	<div class="conv-tag-add">
+		<input
+			class="form-control form-control-sm"
+			type="text"
+			placeholder="Enter new tag..."
+			maxlength={50}
+			bind:value={newTagText}
+			on:keydown={e => { if (e.key === 'Enter') addTag(); }}
+		/>
+		<button
+			class="btn btn-primary btn-sm"
+			disabled={!_.trim(newTagText)}
+			on:click={() => addTag()}
+		>
+			<i class="bx bx-plus" />
+		</button>
+	</div>
 </DialogModal>
 
 <DialogModal
@@ -1763,7 +1787,7 @@
 														disabled={disableAction}
 														on:click={() => toggleTagModal()}
 													>
-														Add Tags
+														Tags
 													</DropdownItem>
 												{/if}
 												{#if agent?.id === LEARNER_AGENT_ID && mode === TRAINING_MODE}