diff --git a/src/components/ConfigPanel.tsx b/src/components/ConfigPanel.tsx
index 7ce1766..6d993b3 100644
--- a/src/components/ConfigPanel.tsx
+++ b/src/components/ConfigPanel.tsx
@@ -1,7 +1,7 @@
-import React, { useState } from 'react';
-import { X, Plus, Trash } from 'lucide-react';
-import { Node } from 'reactflow';
-import { useFlowStore } from '../store/flowStore';
+import React, { useState } from "react";
+import { X, Plus, Trash } from "lucide-react";
+import { Node } from "reactflow";
+import { useFlowStore } from "../store/flowStore";
 
 interface ConfigPanelProps {
   node: Node | null;
@@ -17,18 +17,27 @@ interface Field {
 
 export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
   const { models } = useFlowStore();
-  const [newField, setNewField] = useState<Field>({ name: '', type: 'string' });
+  const [newField, setNewField] = useState<Field>({ name: "", type: "string" });
 
   if (!node) return null;
 
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>) => {
+  const handleChange = (
+    e: React.ChangeEvent<
+      HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement
+    >
+  ) => {
     onUpdateNode(node.id, {
       ...node.data,
       [e.target.name]: e.target.value,
     });
   };
 
-  const handleArrayChange = (index: number, field: string, value: string, arrayName: string) => {
+  const handleArrayChange = (
+    index: number,
+    field: string,
+    value: string,
+    arrayName: string
+  ) => {
     const array = [...(node.data[arrayName] || [])];
     array[index] = { ...array[index], [field]: value };
     onUpdateNode(node.id, {
@@ -43,7 +52,7 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
       ...node.data,
       [arrayName]: array,
     });
-    setNewField({ name: '', type: 'string' });
+    setNewField({ name: "", type: "string" });
   };
 
   const removeField = (index: number, arrayName: string) => {
@@ -55,19 +64,35 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
     });
   };
 
+  const copyQueryFields = () => {
+    const currentFields = node.data.fields || [];
+    navigator.clipboard.writeText(JSON.stringify(currentFields, null, 2));
+  };
+
+  const extractQueryParams = (path: string) => {
+    const params = path.match(/:[a-zA-Z]+/g) || [];
+    return params.map((param) => ({
+      name: param.substring(1),
+      type: "string",
+      validation: "",
+    }));
+  };
+
   const renderDatabaseFields = () => (
     <>
       <div className="mb-4">
         <label className="block text-sm font-medium mb-1">Model</label>
         <select
           name="model"
-          value={node.data.model || ''}
+          value={node.data.model || ""}
           onChange={handleChange}
           className="w-full p-2 border rounded"
         >
           <option value="">Select Model</option>
           {models.map((model) => (
-            <option key={model.id} value={model.id}>{model.name}</option>
+            <option key={model.id} value={model.id}>
+              {model.name}
+            </option>
           ))}
         </select>
       </div>
@@ -75,7 +100,7 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
         <label className="block text-sm font-medium mb-1">SQL Query</label>
         <textarea
           name="query"
-          value={node.data.query || ''}
+          value={node.data.query || ""}
           onChange={handleChange}
           className="w-full p-2 border rounded h-32 font-mono text-sm"
           placeholder="SELECT * FROM table WHERE id = :id"
@@ -86,7 +111,7 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
         <input
           type="text"
           name="resultVar"
-          value={node.data.resultVar || ''}
+          value={node.data.resultVar || ""}
           onChange={handleChange}
           className="w-full p-2 border rounded"
           placeholder="result"
@@ -97,14 +122,16 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
 
   const renderFields = () => {
     switch (node.type) {
-      case 'auth':
+      case "auth":
         return (
           <>
             <div className="mb-4">
-              <label className="block text-sm font-medium mb-1">Auth Type</label>
+              <label className="block text-sm font-medium mb-1">
+                Auth Type
+              </label>
               <select
                 name="authType"
-                value={node.data.authType || 'bearer'}
+                value={node.data.authType || "bearer"}
                 onChange={handleChange}
                 className="w-full p-2 border rounded"
               >
@@ -114,11 +141,13 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
               </select>
             </div>
             <div className="mb-4">
-              <label className="block text-sm font-medium mb-1">Token Variable</label>
+              <label className="block text-sm font-medium mb-1">
+                Token Variable
+              </label>
               <input
                 type="text"
                 name="tokenVar"
-                value={node.data.tokenVar || ''}
+                value={node.data.tokenVar || ""}
                 onChange={handleChange}
                 className="w-full p-2 border rounded"
                 placeholder="token"
@@ -127,33 +156,221 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
           </>
         );
 
-      case 'url':
+      case "url":
         return (
           <>
             <div className="mb-4">
               <label className="block text-sm font-medium mb-1">Method</label>
               <select
                 name="method"
-                value={node.data.method || 'GET'}
+                value={node.data.method || "GET"}
                 onChange={handleChange}
                 className="w-full p-2 border rounded"
               >
-                {['GET', 'POST', 'PUT', 'DELETE', 'PATCH'].map(method => (
-                  <option key={method} value={method}>{method}</option>
+                {["GET", "POST", "PUT", "DELETE", "PATCH"].map((method) => (
+                  <option key={method} value={method}>
+                    {method}
+                  </option>
                 ))}
               </select>
             </div>
             <div className="mb-4">
-              <label className="block text-sm font-medium mb-1">Route Path</label>
+              <label className="block text-sm font-medium mb-1">
+                Route Path
+              </label>
               <input
                 type="text"
                 name="path"
-                value={node.data.path || ''}
-                onChange={handleChange}
+                value={node.data.path || ""}
+                onChange={(e) => {
+                  handleChange(e);
+                  const queryParams = extractQueryParams(e.target.value);
+                  onUpdateNode(node.id, {
+                    ...node.data,
+                    path: e.target.value,
+                    queryFields: queryParams,
+                  });
+                }}
                 className="w-full p-2 border rounded"
                 placeholder="/api/users/:id"
               />
             </div>
+            <div className="mb-4">
+              <label className="block text-sm font-medium mb-1">
+                Body Fields
+              </label>
+              <div className="mb-2 p-2 bg-gray-50 rounded text-sm">
+                {node.data.fields && node.data.fields.length > 0 ? (
+                  node.data.fields.map((field: Field) => (
+                    <div key={field.name} className="text-gray-600">
+                      {field.name}: {field.type}
+                      {field.validation ? ` (${field.validation})` : ""}
+                    </div>
+                  ))
+                ) : (
+                  <div className="text-gray-500 italic">
+                    No body fields defined
+                  </div>
+                )}
+              </div>
+              {(node.data.fields || []).map((field: Field, index: number) => (
+                <div key={index} className="flex gap-1 mb-2">
+                  <input
+                    type="text"
+                    value={field.name}
+                    onChange={(e) =>
+                      handleArrayChange(index, "name", e.target.value, "fields")
+                    }
+                    className="flex-1 p-2 border rounded text-sm"
+                    placeholder="Field name"
+                  />
+                  <select
+                    value={field.type}
+                    onChange={(e) =>
+                      handleArrayChange(index, "type", e.target.value, "fields")
+                    }
+                    className="w-20 p-2 border rounded text-sm"
+                  >
+                    <option value="string">String</option>
+                    <option value="number">Number</option>
+                    <option value="boolean">Bool</option>
+                    <option value="date">Date</option>
+                  </select>
+                  <button
+                    onClick={() => removeField(index, "fields")}
+                    className="p-2 text-red-500 hover:bg-red-50 rounded"
+                  >
+                    <Trash className="w-4 h-4" />
+                  </button>
+                </div>
+              ))}
+              <div className="flex gap-1 mt-2">
+                <input
+                  type="text"
+                  value={newField.name}
+                  onChange={(e) =>
+                    setNewField({ ...newField, name: e.target.value })
+                  }
+                  className="flex-1 p-2 border rounded text-sm"
+                  placeholder="New field name"
+                />
+                <select
+                  value={newField.type}
+                  onChange={(e) =>
+                    setNewField({ ...newField, type: e.target.value })
+                  }
+                  className="w-20 p-2 border rounded text-sm"
+                >
+                  <option value="string">String</option>
+                  <option value="number">Number</option>
+                  <option value="boolean">Bool</option>
+                  <option value="date">Date</option>
+                </select>
+                <button
+                  onClick={() => addField("fields")}
+                  className="p-2 bg-blue-500 text-white rounded hover:bg-blue-600"
+                >
+                  <Plus className="w-4 h-4" />
+                </button>
+              </div>
+            </div>
+            <div className="mb-4">
+              <label className="block text-sm font-medium mb-1">
+                Query Fields
+              </label>
+              <div className="mb-2 p-2 bg-gray-50 rounded text-sm">
+                {node.data.queryFields && node.data.queryFields.length > 0 ? (
+                  node.data.queryFields.map((field: Field) => (
+                    <div key={field.name} className="text-gray-600">
+                      {field.name}: {field.type}
+                      {field.validation ? ` (${field.validation})` : ""}
+                    </div>
+                  ))
+                ) : (
+                  <div className="text-gray-500 italic">
+                    No query fields defined
+                  </div>
+                )}
+              </div>
+              {(node.data.queryFields || []).map(
+                (field: Field, index: number) => (
+                  <div key={index} className="flex gap-1 mb-2">
+                    <input
+                      type="text"
+                      value={field.name}
+                      onChange={(e) =>
+                        handleArrayChange(
+                          index,
+                          "name",
+                          e.target.value,
+                          "queryFields"
+                        )
+                      }
+                      className="flex-1 p-2 border rounded text-sm"
+                      placeholder="Field name"
+                    />
+                    <select
+                      value={field.type}
+                      onChange={(e) =>
+                        handleArrayChange(
+                          index,
+                          "type",
+                          e.target.value,
+                          "queryFields"
+                        )
+                      }
+                      className="w-20 p-2 border rounded text-sm"
+                    >
+                      <option value="string">String</option>
+                      <option value="number">Number</option>
+                      <option value="boolean">Bool</option>
+                      <option value="date">Date</option>
+                    </select>
+                    <button
+                      onClick={() => removeField(index, "queryFields")}
+                      className="p-2 text-red-500 hover:bg-red-50 rounded"
+                    >
+                      <Trash className="w-4 h-4" />
+                    </button>
+                  </div>
+                )
+              )}
+              <div className="flex gap-1 mt-2">
+                <input
+                  type="text"
+                  value={newField.name}
+                  onChange={(e) =>
+                    setNewField({ ...newField, name: e.target.value })
+                  }
+                  className="flex-1 p-2 border rounded text-sm"
+                  placeholder="New query param"
+                />
+                <select
+                  value={newField.type}
+                  onChange={(e) =>
+                    setNewField({ ...newField, type: e.target.value })
+                  }
+                  className="w-20 p-2 border rounded text-sm"
+                >
+                  <option value="string">String</option>
+                  <option value="number">Number</option>
+                  <option value="boolean">Bool</option>
+                  <option value="date">Date</option>
+                </select>
+                <button
+                  onClick={() => addField("queryFields")}
+                  className="p-2 bg-blue-500 text-white rounded hover:bg-blue-600"
+                >
+                  <Plus className="w-4 h-4" />
+                </button>
+              </div>
+            </div>
+          </>
+        );
+
+      case "output":
+        return (
+          <>
             <div className="mb-4">
               <label className="block text-sm font-medium mb-1">Fields</label>
               {(node.data.fields || []).map((field: Field, index: number) => (
@@ -161,13 +378,17 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
                   <input
                     type="text"
                     value={field.name}
-                    onChange={(e) => handleArrayChange(index, 'name', e.target.value, 'fields')}
+                    onChange={(e) =>
+                      handleArrayChange(index, "name", e.target.value, "fields")
+                    }
                     className="flex-1 p-2 border rounded"
                     placeholder="Field name"
                   />
                   <select
                     value={field.type}
-                    onChange={(e) => handleArrayChange(index, 'type', e.target.value, 'fields')}
+                    onChange={(e) =>
+                      handleArrayChange(index, "type", e.target.value, "fields")
+                    }
                     className="w-24 p-2 border rounded"
                   >
                     <option value="string">String</option>
@@ -175,15 +396,8 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
                     <option value="boolean">Boolean</option>
                     <option value="date">Date</option>
                   </select>
-                  <input
-                    type="text"
-                    value={field.validation}
-                    onChange={(e) => handleArrayChange(index, 'validation', e.target.value, 'fields')}
-                    className="flex-1 p-2 border rounded"
-                    placeholder="Validation"
-                  />
                   <button
-                    onClick={() => removeField(index, 'fields')}
+                    onClick={() => removeField(index, "fields")}
                     className="p-2 text-red-500 hover:bg-red-50 rounded"
                   >
                     <Trash className="w-4 h-4" />
@@ -194,13 +408,17 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
                 <input
                   type="text"
                   value={newField.name}
-                  onChange={(e) => setNewField({ ...newField, name: e.target.value })}
+                  onChange={(e) =>
+                    setNewField({ ...newField, name: e.target.value })
+                  }
                   className="flex-1 p-2 border rounded"
                   placeholder="New field name"
                 />
                 <select
                   value={newField.type}
-                  onChange={(e) => setNewField({ ...newField, type: e.target.value })}
+                  onChange={(e) =>
+                    setNewField({ ...newField, type: e.target.value })
+                  }
                   className="w-24 p-2 border rounded"
                 >
                   <option value="string">String</option>
@@ -209,7 +427,7 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
                   <option value="date">Date</option>
                 </select>
                 <button
-                  onClick={() => addField('fields')}
+                  onClick={() => addField("fields")}
                   className="px-3 py-1 bg-blue-500 text-white rounded hover:bg-blue-600"
                 >
                   <Plus className="w-4 h-4" />
@@ -219,76 +437,17 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
           </>
         );
 
-      case 'output':
+      case "variable":
         return (
           <>
             <div className="mb-4">
-              <label className="block text-sm font-medium mb-1">Fields</label>
-              {(node.data.fields || []).map((field: Field, index: number) => (
-                <div key={index} className="flex gap-2 mb-2">
-                  <input
-                    type="text"
-                    value={field.name}
-                    onChange={(e) => handleArrayChange(index, 'name', e.target.value, 'fields')}
-                    className="flex-1 p-2 border rounded"
-                    placeholder="Field name"
-                  />
-                  <select
-                    value={field.type}
-                    onChange={(e) => handleArrayChange(index, 'type', e.target.value, 'fields')}
-                    className="w-24 p-2 border rounded"
-                  >
-                    <option value="string">String</option>
-                    <option value="number">Number</option>
-                    <option value="boolean">Boolean</option>
-                    <option value="date">Date</option>
-                  </select>
-                  <button
-                    onClick={() => removeField(index, 'fields')}
-                    className="p-2 text-red-500 hover:bg-red-50 rounded"
-                  >
-                    <Trash className="w-4 h-4" />
-                  </button>
-                </div>
-              ))}
-              <div className="flex gap-2 mt-2">
-                <input
-                  type="text"
-                  value={newField.name}
-                  onChange={(e) => setNewField({ ...newField, name: e.target.value })}
-                  className="flex-1 p-2 border rounded"
-                  placeholder="New field name"
-                />
-                <select
-                  value={newField.type}
-                  onChange={(e) => setNewField({ ...newField, type: e.target.value })}
-                  className="w-24 p-2 border rounded"
-                >
-                  <option value="string">String</option>
-                  <option value="number">Number</option>
-                  <option value="boolean">Boolean</option>
-                  <option value="date">Date</option>
-                </select>
-                <button
-                  onClick={() => addField('fields')}
-                  className="px-3 py-1 bg-blue-500 text-white rounded hover:bg-blue-600"
-                >
-                  <Plus className="w-4 h-4" />
-                </button>
-              </div>
-            </div>
-          </>
-        );
-
-      case 'variable':
-        return (
-          <>
-            <div className="mb-4">
-              <label className="block text-sm font-medium mb-1">Variable Name</label>
+              <label className="block text-sm font-medium mb-1">
+                Variable Name
+              </label>
               <input
                 type="text"
                 name="name"
-                value={node.data.name || ''}
+                value={node.data.name || ""}
                 onChange={handleChange}
                 className="w-full p-2 border rounded"
                 placeholder="myVariable"
@@ -298,7 +457,7 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
               <label className="block text-sm font-medium mb-1">Type</label>
               <select
                 name="type"
-                value={node.data.type || 'string'}
+                value={node.data.type || "string"}
                 onChange={handleChange}
                 className="w-full p-2 border rounded"
               >
@@ -310,11 +469,13 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
               </select>
             </div>
             <div className="mb-4">
-              <label className="block text-sm font-medium mb-1">Default Value</label>
+              <label className="block text-sm font-medium mb-1">
+                Default Value
+              </label>
               <input
                 type="text"
                 name="defaultValue"
-                value={node.data.defaultValue || ''}
+                value={node.data.defaultValue || ""}
                 onChange={handleChange}
                 className="w-full p-2 border rounded"
                 placeholder="Default value"
@@ -323,13 +484,15 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
           </>
         );
 
-      case 'logic':
+      case "logic":
         return (
           <div className="mb-4">
-            <label className="block text-sm font-medium mb-1">JavaScript Code</label>
+            <label className="block text-sm font-medium mb-1">
+              JavaScript Code
+            </label>
             <textarea
               name="code"
-              value={node.data.code || ''}
+              value={node.data.code || ""}
               onChange={handleChange}
               className="w-full p-2 border rounded h-40 font-mono text-sm"
               placeholder="// Write your JavaScript code here"
@@ -337,19 +500,33 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
           </div>
         );
 
-      case 'db-find':
-      case 'db-query':
-        return renderDatabaseFields();
-
-      case 'db-insert':
+      case "db-find":
+      case "db-query":
         return (
           <>
             {renderDatabaseFields()}
             <div className="mb-4">
-              <label className="block text-sm font-medium mb-1">Variables</label>
+              <button
+                onClick={copyQueryFields}
+                className="px-3 py-1 text-sm bg-gray-100 hover:bg-gray-200 rounded"
+              >
+                Copy Fields
+              </button>
+            </div>
+          </>
+        );
+
+      case "db-insert":
+        return (
+          <>
+            {renderDatabaseFields()}
+            <div className="mb-4">
+              <label className="block text-sm font-medium mb-1">
+                Variables
+              </label>
               <textarea
                 name="variables"
-                value={node.data.variables || ''}
+                value={node.data.variables || ""}
                 onChange={handleChange}
                 className="w-full p-2 border rounded h-20 font-mono text-sm"
                 placeholder="name: string&#10;age: number"
@@ -358,8 +535,8 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
           </>
         );
 
-      case 'db-update':
-      case 'db-delete':
+      case "db-update":
+      case "db-delete":
         return (
           <>
             {renderDatabaseFields()}
@@ -368,18 +545,20 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
               <input
                 type="text"
                 name="idField"
-                value={node.data.idField || ''}
+                value={node.data.idField || ""}
                 onChange={handleChange}
                 className="w-full p-2 border rounded"
                 placeholder="id"
               />
             </div>
-            {node.type === 'db-update' && (
+            {node.type === "db-update" && (
               <div className="mb-4">
-                <label className="block text-sm font-medium mb-1">Variables</label>
+                <label className="block text-sm font-medium mb-1">
+                  Variables
+                </label>
                 <textarea
                   name="variables"
-                  value={node.data.variables || ''}
+                  value={node.data.variables || ""}
                   onChange={handleChange}
                   className="w-full p-2 border rounded h-20 font-mono text-sm"
                   placeholder="name: string&#10;age: number"
@@ -405,4 +584,4 @@ export function ConfigPanel({ node, onClose, onUpdateNode }: ConfigPanelProps) {
       {renderFields()}
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/DefaultTablesModal.tsx b/src/components/DefaultTablesModal.tsx
index 0058f9c..8eda1ad 100644
--- a/src/components/DefaultTablesModal.tsx
+++ b/src/components/DefaultTablesModal.tsx
@@ -67,7 +67,9 @@ export function DefaultTablesModal({
   onClose,
 }: DefaultTablesModalProps) {
   const [selectedTables, setSelectedTables] = useState<string[]>([]);
-  const { addModel } = useFlowStore();
+  const [includeAdminRole, setIncludeAdminRole] = useState(true);
+  const [includeMemberRole, setIncludeMemberRole] = useState(true);
+  const { addModel, addRole } = useFlowStore();
 
   const handleToggleTable = (tableId: string) => {
     setSelectedTables((prev) =>
@@ -88,6 +90,42 @@ export function DefaultTablesModal({
         });
       }
     });
+
+    // Add roles based on checkbox selection
+    if (selectedTables.includes("user")) {
+      if (includeAdminRole) {
+        addRole({
+          id: `role_admin_${Date.now()}`,
+          name: "Admin",
+          slug: "admin",
+          permissions: {
+            authRequired: true,
+            routes: [],
+            canCreateUsers: true,
+            canEditUsers: true,
+            canDeleteUsers: true,
+            canManageRoles: true,
+          },
+        });
+      }
+
+      if (includeMemberRole) {
+        addRole({
+          id: `role_member_${Date.now()}`,
+          name: "Member",
+          slug: "member",
+          permissions: {
+            authRequired: true,
+            routes: [],
+            canCreateUsers: false,
+            canEditUsers: false,
+            canDeleteUsers: false,
+            canManageRoles: false,
+          },
+        });
+      }
+    }
+
     onClose();
   };
 
@@ -127,6 +165,39 @@ export function DefaultTablesModal({
                     <div className="mt-2 text-sm text-gray-500">
                       Fields: {table.fields.map((f) => f.name).join(", ")}
                     </div>
+
+                    {/* Add role options when User table is selected */}
+                    {table.id === "user" && selectedTables.includes("user") && (
+                      <div className="mt-3 pl-2 border-l-2 border-gray-200">
+                        <p className="text-sm font-medium text-gray-700 mb-2">
+                          Include roles:
+                        </p>
+                        <div className="space-y-2">
+                          <label className="flex items-center space-x-2 text-sm">
+                            <input
+                              type="checkbox"
+                              checked={includeAdminRole}
+                              onChange={(e) =>
+                                setIncludeAdminRole(e.target.checked)
+                              }
+                              className="rounded border-gray-300 text-blue-600 shadow-sm focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
+                            />
+                            <span>Admin Role</span>
+                          </label>
+                          <label className="flex items-center space-x-2 text-sm">
+                            <input
+                              type="checkbox"
+                              checked={includeMemberRole}
+                              onChange={(e) =>
+                                setIncludeMemberRole(e.target.checked)
+                              }
+                              className="rounded border-gray-300 text-blue-600 shadow-sm focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50"
+                            />
+                            <span>Member Role</span>
+                          </label>
+                        </div>
+                      </div>
+                    )}
                   </div>
                 </label>
               </div>
diff --git a/src/components/RouteFlowEditor.tsx b/src/components/RouteFlowEditor.tsx
index 15c2d02..8031133 100644
--- a/src/components/RouteFlowEditor.tsx
+++ b/src/components/RouteFlowEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, useEffect } from 'react';
+import React, { useCallback, useRef, useEffect } from "react";
 import ReactFlow, {
   Background,
   Controls,
@@ -9,13 +9,13 @@ import ReactFlow, {
   applyNodeChanges,
   applyEdgeChanges,
   Panel,
-} from 'reactflow';
-import { ArrowLeft, Save } from 'lucide-react';
-import { useFlowStore } from '../store/flowStore';
-import { ConfigPanel } from './ConfigPanel';
-import { ComponentsPanel } from './ComponentsPanel';
-import CustomNode from './CustomNode';
-import 'reactflow/dist/style.css';
+} from "reactflow";
+import { ArrowLeft, Save } from "lucide-react";
+import { useFlowStore } from "../store/flowStore";
+import { ConfigPanel } from "./ConfigPanel";
+import { ComponentsPanel } from "./ComponentsPanel";
+import CustomNode from "./CustomNode";
+import "reactflow/dist/style.css";
 
 const nodeTypes = {
   auth: CustomNode,
@@ -23,11 +23,11 @@ const nodeTypes = {
   output: CustomNode,
   logic: CustomNode,
   variable: CustomNode,
-  'db-find': CustomNode,
-  'db-insert': CustomNode,
-  'db-update': CustomNode,
-  'db-delete': CustomNode,
-  'db-query': CustomNode,
+  "db-find": CustomNode,
+  "db-insert": CustomNode,
+  "db-update": CustomNode,
+  "db-delete": CustomNode,
+  "db-query": CustomNode,
 };
 
 interface FlowEditorContentProps {
@@ -55,7 +55,18 @@ function FlowEditorContent({ route, onClose }: FlowEditorContentProps) {
       setNodes(route.flowData.nodes);
       setEdges(route.flowData.edges);
     } else {
-      setNodes([]);
+      // Create default URL node for new routes
+      const defaultNode = {
+        id: `node_${Date.now()}`,
+        type: "url",
+        position: { x: 100, y: 100 },
+        data: {
+          label: "URL",
+          path: route.url,
+          method: route.method,
+        },
+      };
+      setNodes([defaultNode]);
       setEdges([]);
     }
   }, [route, setNodes, setEdges]);
@@ -77,14 +88,14 @@ function FlowEditorContent({ route, onClose }: FlowEditorContentProps) {
 
   const onDragOver = useCallback((event: React.DragEvent) => {
     event.preventDefault();
-    event.dataTransfer.dropEffect = 'move';
+    event.dataTransfer.dropEffect = "move";
   }, []);
 
   const onDrop = useCallback(
     (event: React.DragEvent) => {
       event.preventDefault();
 
-      const type = event.dataTransfer.getData('application/reactflow');
+      const type = event.dataTransfer.getData("application/reactflow");
       if (!type || !reactFlowWrapper.current) return;
 
       const reactFlowBounds = reactFlowWrapper.current.getBoundingClientRect();
@@ -97,7 +108,9 @@ function FlowEditorContent({ route, onClose }: FlowEditorContentProps) {
         id: `node_${Date.now()}`,
         type,
         position,
-        data: { label: type.charAt(0).toUpperCase() + type.slice(1).replace('-', ' ') },
+        data: {
+          label: type.charAt(0).toUpperCase() + type.slice(1).replace("-", " "),
+        },
       };
 
       setNodes((nds) => [...nds, newNode]);
@@ -194,4 +207,4 @@ export function RouteFlowEditor({ route, onClose }: FlowEditorContentProps) {
       <FlowEditorContent route={route} onClose={onClose} />
     </ReactFlowProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/RouteModal.tsx b/src/components/RouteModal.tsx
index 038a5ae..c2b6e28 100644
--- a/src/components/RouteModal.tsx
+++ b/src/components/RouteModal.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useEffect } from 'react';
-import { X, Trash2 } from 'lucide-react';
-import { useFlowStore } from '../store/flowStore';
+import React, { useState, useEffect } from "react";
+import { X, Trash2 } from "lucide-react";
+import { useFlowStore } from "../store/flowStore";
 
 interface RouteModalProps {
   isOpen: boolean;
@@ -15,9 +15,9 @@ interface RouteModalProps {
 
 const createInitialFormData = () => ({
   id: `route_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
-  name: '',
-  url: '',
-  method: 'GET',
+  name: "",
+  url: "",
+  method: "GET",
 });
 
 export function RouteModal({ isOpen, onClose, route }: RouteModalProps) {
@@ -32,7 +32,9 @@ export function RouteModal({ isOpen, onClose, route }: RouteModalProps) {
     }
   }, [route, isOpen]);
 
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>) => {
+  const handleChange = (
+    e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>
+  ) => {
     const { name, value } = e.target;
     setFormData({
       ...formData,
@@ -63,12 +65,9 @@ export function RouteModal({ isOpen, onClose, route }: RouteModalProps) {
       <div className="bg-white rounded-lg w-full max-w-md">
         <div className="p-4 border-b border-gray-200 flex justify-between items-center">
           <h2 className="text-lg font-semibold">
-            {route ? 'Edit Route' : 'Add New Route'}
+            {route ? "Edit Route" : "Add New Route"}
           </h2>
-          <button
-            onClick={onClose}
-            className="p-1 hover:bg-gray-100 rounded"
-          >
+          <button onClick={onClose} className="p-1 hover:bg-gray-100 rounded">
             <X className="w-5 h-5" />
           </button>
         </div>
@@ -76,7 +75,9 @@ export function RouteModal({ isOpen, onClose, route }: RouteModalProps) {
         <div className="p-4">
           <div className="space-y-4">
             <div>
-              <label className="block text-sm font-medium mb-1">Route Name</label>
+              <label className="block text-sm font-medium mb-1">
+                Route Name
+              </label>
               <input
                 type="text"
                 name="name"
@@ -138,11 +139,11 @@ export function RouteModal({ isOpen, onClose, route }: RouteModalProps) {
               onClick={handleSave}
               className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600"
             >
-              {route ? 'Update' : 'Save'} Route
+              {route ? "Update" : "Save"} Route
             </button>
           </div>
         </div>
       </div>
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/RoutesPanel.tsx b/src/components/RoutesPanel.tsx
index 5b6959f..470a9c1 100644
--- a/src/components/RoutesPanel.tsx
+++ b/src/components/RoutesPanel.tsx
@@ -1,8 +1,8 @@
-import React, { useState } from 'react';
-import { Plus, Edit2, Code } from 'lucide-react';
-import { useFlowStore } from '../store/flowStore';
-import { RouteModal } from './RouteModal';
-import { RouteFlowEditor } from './RouteFlowEditor';
+import React, { useState } from "react";
+import { Plus, Edit2, Code } from "lucide-react";
+import { useFlowStore } from "../store/flowStore";
+import { RouteModal } from "./RouteModal";
+import { RouteFlowEditor } from "./RouteFlowEditor";
 
 export function RoutesPanel() {
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -11,55 +11,59 @@ export function RoutesPanel() {
   const { routes } = useFlowStore();
 
   return (
-    <div className="space-y-4">
+    <div className="flex flex-col h-full">
       {!editingRoute ? (
         <>
-          <button
-            onClick={() => {
-              setSelectedRoute(null);
-              setIsModalOpen(true);
-            }}
-            className="w-full flex items-center justify-center gap-2 px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 transition-colors"
-          >
-            <Plus className="w-4 h-4" />
-            Add Route
-          </button>
+          <div className="p-4">
+            <button
+              onClick={() => {
+                setSelectedRoute(null);
+                setIsModalOpen(true);
+              }}
+              className="flex items-center justify-center gap-2 px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600 w-full"
+            >
+              <Plus className="w-4 h-4" />
+              Add Route
+            </button>
+          </div>
 
-          <div className="space-y-3">
-            {routes.map((route) => (
-              <div
-                key={route.id}
-                className="bg-white border rounded-lg p-4 hover:shadow-md transition-shadow"
-              >
-                <div className="flex justify-between items-start">
-                  <div>
-                    <h3 className="font-medium">{route.name}</h3>
-                    <p className="text-sm text-gray-500">
-                      {route.method} {route.url}
-                    </p>
-                  </div>
-                  <div className="flex gap-2">
-                    <button
-                      onClick={() => {
-                        setSelectedRoute(route);
-                        setIsModalOpen(true);
-                      }}
-                      className="p-1 hover:bg-gray-100 rounded"
-                      title="Edit Route"
-                    >
-                      <Edit2 className="w-4 h-4" />
-                    </button>
-                    <button
-                      onClick={() => setEditingRoute(route)}
-                      className="p-1 hover:bg-gray-100 rounded"
-                      title="Edit Components"
-                    >
-                      <Code className="w-4 h-4" />
-                    </button>
+          <div className="flex-1 overflow-y-auto px-4">
+            <div className="space-y-3">
+              {routes.map((route) => (
+                <div
+                  key={route.id}
+                  className="bg-white border rounded-lg p-4 hover:shadow-md transition-shadow"
+                >
+                  <div className="flex justify-between items-start">
+                    <div>
+                      <h3 className="font-medium">{route.name}</h3>
+                      <p className="text-sm text-gray-500">
+                        {route.method} {route.url}
+                      </p>
+                    </div>
+                    <div className="flex gap-2">
+                      <button
+                        onClick={() => {
+                          setSelectedRoute(route);
+                          setIsModalOpen(true);
+                        }}
+                        className="p-1 hover:bg-gray-100 rounded"
+                        title="Edit Route"
+                      >
+                        <Edit2 className="w-4 h-4" />
+                      </button>
+                      <button
+                        onClick={() => setEditingRoute(route)}
+                        className="p-1 hover:bg-gray-100 rounded"
+                        title="Edit Components"
+                      >
+                        <Code className="w-4 h-4" />
+                      </button>
+                    </div>
                   </div>
                 </div>
-              </div>
-            ))}
+              ))}
+            </div>
           </div>
 
           <RouteModal
@@ -81,4 +85,4 @@ export function RoutesPanel() {
       )}
     </div>
   );
-}
\ No newline at end of file
+}