diff --git a/src/lib/components/Composite.svelte b/src/lib/components/Composite.svelte
index dfe6959..2da1b00 100644
--- a/src/lib/components/Composite.svelte
+++ b/src/lib/components/Composite.svelte
@@ -11,7 +11,7 @@
 	}
 </script>
 
-<div class="grid h-full w-full" style="display: grid; {componentsData.layout || ''}">
+<div class="grid w-full h-full" style="display: grid; {componentsData.layout || ''}">
 	{#each componentsData.children as component (component.id)}
 		{#await getComponent(component.componentName) then Component}
 			{#if Component}
diff --git a/src/lib/components/MessageInput.svelte b/src/lib/components/MessageInput.svelte
index fc28004..99a5704 100644
--- a/src/lib/components/MessageInput.svelte
+++ b/src/lib/components/MessageInput.svelte
@@ -1,47 +1,76 @@
 <script>
 	import { createMessage, clearMessages } from '$lib/services/messages';
 
-	createMessage({
-		text: 'Component loaded',
-		sender: '$lib/components/MessageInput.svelte',
-		type: 'SYSTEM'
-	});
-
 	let newMessageText = '';
 
+	// Default message composite structure
+	const messageComposite = {
+		layout: '',
+		children: [
+			{
+				componentName: 'HelloEarth',
+				props: {}
+			}
+		]
+	};
+
 	function handleSend() {
 		if (newMessageText.trim() !== '') {
-			// Create a new message with the default sender and type using an object
-			createMessage({ text: newMessageText, sender: 'user', type: 'chat' });
+			// Default message without composite
+			const message = {
+				text: newMessageText,
+				sender: 'user',
+				type: 'chat'
+			};
+
+			// Check if text contains @app:command and add the composite accordingly
+			const appCommandPattern = /@app:(\w+)/;
+			const match = newMessageText.match(appCommandPattern);
+			if (match && match[1]) {
+				message.composite = {
+					layout: '',
+					children: [
+						{
+							componentName: match[1], // Matched component name
+							props: {}
+						}
+					]
+				};
+			}
+
+			createMessage(message);
+
+			// Store the last message that was sent
+			lastMessageSent = newMessageText;
 			newMessageText = '';
 		}
 	}
 
 	function handleClear() {
-		clearMessages(); // Call the clearMessages function to clear all messages.
+		clearMessages();
 	}
 
 	function handleKeyDown(event) {
 		if (event.key === 'Enter') {
 			handleSend();
-			event.preventDefault(); // Prevents a newline being added to the input field
+			event.preventDefault();
 		}
 	}
 </script>
 
-<footer class="bg-white p-4 flex justify-end">
+<footer class="flex justify-end p-4 bg-white">
 	<input
 		type="text"
-		class="flex-grow border rounded px-3 py-2 mr-2"
+		class="flex-grow px-3 py-2 mr-2 border rounded"
 		placeholder="Type your message..."
 		bind:value={newMessageText}
 		on:keydown={handleKeyDown}
 	/>
-	<button class="bg-blue-500 hover:bg-blue-600 text-white py-2 px-4 rounded" on:click={handleSend}>
+	<button class="px-4 py-2 text-white bg-blue-500 rounded hover:bg-blue-600" on:click={handleSend}>
 		Send Message
 	</button>
 	<button
-		class="bg-red-500 hover:bg-red-600 text-white py-2 px-4 rounded ml-2"
+		class="px-4 py-2 ml-2 text-white bg-red-500 rounded hover:bg-red-600"
 		on:click={handleClear}
 	>
 		Clear
diff --git a/src/lib/components/Messages.svelte b/src/lib/components/Messages.svelte
index b88f8fd..b6a2e79 100644
--- a/src/lib/components/Messages.svelte
+++ b/src/lib/components/Messages.svelte
@@ -1,6 +1,7 @@
 <script>
 	import { messages, createMessage } from '$lib/services/messages';
-	import { onMount, afterUpdate } from 'svelte';
+	import { onMount } from 'svelte';
+	import Composite from './Composite.svelte';
 
 	let latestMessages = [];
 
@@ -16,20 +17,32 @@
 		}
 	};
 
+	// Watch for changes in latestMessages
+	$: {
+		// Use setTimeout to give the DOM some time to update
+		setTimeout(scrollToBottom, 50);
+	}
+
 	onMount(scrollToBottom);
-	afterUpdate(scrollToBottom);
 </script>
 
-<main bind:this={messagesContainer} class="p-4 overflow-y-auto h-full w-full">
+<main bind:this={messagesContainer} class="w-full h-full p-4 overflow-y-auto">
 	{#each latestMessages as message}
-		<div class="bg-white p-3 rounded-lg shadow-lg mb-2 border-b border-gray-300">
+		<div class="p-3 mb-2 bg-white border-b border-gray-300 rounded-lg shadow-lg">
 			<div class="flex items-center justify-between">
 				<p class="text-sm text-gray-600">
 					{message.type} | {message.sender}
 				</p>
 				<p class="text-xs text-gray-600">{message.timestamp}</p>
 			</div>
-			<p class="text-base text-gray-800 mt-2">{message.text}</p>
+			<p class="mt-2 text-base text-gray-800">{message.text}</p>
+
+			<!-- Render Composite Component -->
+			{#if message.composite}
+				<div class="mt-2 overflow-y-auto max-h-500">
+					<Composite componentsData={message.composite} />
+				</div>
+			{/if}
 		</div>
 	{/each}
 </main>
diff --git a/src/lib/services/messages.ts b/src/lib/services/messages.ts
index 6a13cfb..a7883f3 100644
--- a/src/lib/services/messages.ts
+++ b/src/lib/services/messages.ts
@@ -28,8 +28,10 @@ export interface Message {
   timestamp: string;
   sender: string;
   type: string;
+  composite?: object | null; // New field
 }
 
+
 // Load messages from localStorage or set an empty array if not available
 const initialMessages = getFromLocalStorage('chat-messages', []);
 
@@ -48,11 +50,11 @@ export function createMessage(messageData) {
     text: messageData.text,
     timestamp: currentDate,
     sender: messageData.sender,
-    type: messageData.type
+    type: messageData.type,
+    composite: messageData.composite || null // New field
   };
   messages.update(oldMessages => [...oldMessages, newMessageObj]);
 }
-
 export function clearMessages() {
   messages.set([]);
 }