diff --git a/console/src/App.vue b/console/src/App.vue
index 9114967..3ef8d61 100644
--- a/console/src/App.vue
+++ b/console/src/App.vue
@@ -14,8 +14,10 @@ import CommandsWidget from "./components/dashboard/CommandsWidget.vue";
     <div class="layout-container">
         <AppTopbar />
         <div class="layout-grid">
-            <PropertiesWidget device-id="example-gps-fedora" />
-            <CommandsWidget device-id="example-gps-fedora" />
+            <div class="layout-grid-row">
+                <PropertiesWidget device-id="example-gps-fedora" />
+                <CommandsWidget device-id="example-gps-fedora" />
+            </div>
             <StatsWidget />
             <!-- <div class="layout-grid-row">
                 <SalesTrendWidget />
diff --git a/console/src/components/dashboard/CommandsWidget.vue b/console/src/components/dashboard/CommandsWidget.vue
index bf4dc55..c72b509 100644
--- a/console/src/components/dashboard/CommandsWidget.vue
+++ b/console/src/components/dashboard/CommandsWidget.vue
@@ -2,6 +2,11 @@
 import { ref, reactive, watch, onMounted } from 'vue'
 import MQTTService from '../../services/mqtt.js'
 
+import Accordion from 'primevue/accordion';
+import AccordionPanel from 'primevue/accordionpanel';
+import AccordionHeader from 'primevue/accordionheader';
+import AccordionContent from 'primevue/accordioncontent';
+
 const props = defineProps({
   deviceId: String
 })
@@ -21,11 +26,12 @@ function rebuildList() {
 
 function updateCommand(device, name, field, value) {
   if (!commandMap[name]) {
-    commandMap[name] = {
-      name,
-      description: '',
-      input: ''
-    }
+        commandMap[name] = {
+        name,
+        description: '',
+        schema: '',
+        input: ''
+        }
   }
 
   commandMap[name][field] = value
@@ -36,7 +42,7 @@ function sendCommand(cmd) {
 
   const topic = `device/${props.deviceId}/command/${cmd.name}`
 
-  mqtt2.publish(topic, JSON.stringify(cmd.input))
+  mqtt2.publish(topic, cmd.input || '{}')
 }
 
 watch(() => props.deviceId, () => {
@@ -61,6 +67,9 @@ onMounted(() => {
     if (field === 'description') {
       updateCommand(device, command, 'description', payload)
     }
+    if (field === 'schema') {
+      updateCommand(device, command, 'schema', payload)
+    }
 
   })
 
@@ -81,34 +90,67 @@ onMounted(() => {
         </template>
       <template #empty> No commands available.</template>
       <template #list="slotProps">
-        <div
-          v-for="cmd in slotProps.items"
-          :key="cmd.name"
-          class="p-card p-mb-3"
-          style="padding:1rem"
-        >
+        <Accordion>
 
-          <h3>{{ cmd.name }}</h3>
+            <AccordionPanel
+            v-for="cmd in slotProps.items"
+            :key="cmd.name"
+            :value="cmd.name"
+            >
 
-          <p>{{ cmd.description }}</p>
+            <AccordionHeader>
+                <div class="command-header">
+                <span class="command-name">{{ cmd.name }}</span>
+                <span class="command-desc">{{ cmd.description }}</span>
+                </div>
+            </AccordionHeader>
+            <AccordionContent>
+                <div class="command-body">
 
-          <Textarea
-            v-model="cmd.input"
-            rows="3"
-            style="width:100%"
-            placeholder="JSON arguments..."
-          />
+                    <Textarea
+                    v-model="cmd.input"
+                    rows="4"
+                    style="width:100%"
+                    :placeholder="cmd.schema || 'JSON arguments...'"
+                    />
 
-          <Button
-            label="Send Command"
-            icon="pi pi-send"
-            class="p-mt-2"
-            @click="sendCommand(cmd)"
-          />
+                    <Button
+                    label="Send Command"
+                    icon="pi pi-send"
+                    class="p-mt-2"
+                    @click="sendCommand(cmd)"
+                    />
 
-        </div>
+                </div>
+            </AccordionContent>
 
-      </template>
+            </AccordionPanel>
+
+        </Accordion>
+        </template>
     </DataView>
 </div>
-</template>
\ No newline at end of file
+</template>
+
+<style scoped>
+
+.command-header {
+  display: flex;
+  gap: 10px;
+  align-items: center;
+}
+
+.command-name {
+  font-weight: 600;
+}
+
+.command-desc {
+  color: #666;
+  font-size: 0.9rem;
+}
+
+.command-body {
+  padding-top: 0.5rem;
+}
+
+</style>
\ No newline at end of file