diff --git a/composer.json b/composer.json
index d21bf9e..4f7a2f6 100644
--- a/composer.json
+++ b/composer.json
@@ -34,9 +34,9 @@
     },
     "require": {
         "php": "^8.1.0",
-        "illuminate/support": "~10.0",
-        "illuminate/filesystem": "~10.0",
-        "illuminate/console": "~10.0"
+        "illuminate/support": ">=10.0.0",
+        "illuminate/filesystem": ">=10.0.0",
+        "illuminate/console": ">=10.0.0"
     },
 
     "require-dev": {
diff --git a/src/Console/Commands/EndpointMakeCommand.php b/src/Console/Commands/EndpointMakeCommand.php
index b3524e0..705d0ee 100644
--- a/src/Console/Commands/EndpointMakeCommand.php
+++ b/src/Console/Commands/EndpointMakeCommand.php
@@ -86,7 +86,7 @@ public function handle()
 
             $this->replaceInFile(
                 '//',
-                "return Inertia::render('".$vue."',[\n\t\t\t\n\t\t]);",
+                "return Inertia::render('".$vue."', [\n\t\t\t\n\t\t]);",
                 $controllerPath
             );
         }
@@ -107,6 +107,7 @@ protected function replaceInFile($search, $replace, $path)
 
     protected function buildPath(string $path, string $file)
     {
+        if ($path === '') return $file;
         return $path . '/' . $file;
     }
 
diff --git a/stubs/modal.form.stub b/stubs/modal.form.stub
index cc755d7..16d1435 100644
--- a/stubs/modal.form.stub
+++ b/stubs/modal.form.stub
@@ -1,47 +1,47 @@
 <template>
+    <Head title="" />
     <Modal>
         <ModalBody>
             <ModalHeader>
                 <!-- Title -->
             </ModalHeader>
-            <form @submit.prevent="submit" class="p-4 space-y-4">
-
-                <!-- ... -->
-
-                <div class="flex gap-x-4 justify-end items-center">
-                    <SecondaryButton type="button" @click="close">
+            <form @submit.prevent="onSubmit">
+                <ModalContent>
+                    <!-- ... -->
+                </ModalContent>
+                <ModalFooter>
+                    <SecondaryButton @click="close">
                         Cancel
                     </SecondaryButton>
                     <PrimaryButton type="submit">
                         Create
                     </PrimaryButton>
-                </div>
+                </ModalFooter>
             </form>
         </ModalBody>
     </Modal>
 </template>
 
 <script setup>
-import { useForm } from '@inertiajs/vue3'
+import { Head, useForm } from '@inertiajs/vue3'
 import { ref } from 'vue'
 import { useModal } from 'momentum-modal'
-import Modal from '@/Components/Modal/Modal.vue';
-import ModalHeader from '@/Components/Modal/ModalHeader.vue';
-import ModalBody from '@/Components/Modal/ModalBody.vue';
-import SecondaryButton from '@/Components/Buttons/SecondaryButton.vue';
-import PrimaryButton from '@/Components/Buttons/PrimaryButton.vue';
+import { Modal, ModalBody ModalHeader, ModalContent, ModalFooter } from '@/Components/Modal';
+import { PrimaryButton, SecondaryButton } from '@/Components/Button
+import { Text } from '@/Components/Utility'
+import { Field } from '@/Components/Form
 
 const { close } = useModal()
 
 const props = defineProps({
-    
+    // name: Type,
 })
 
 const form = useForm({
     // ...
 })
 
-const submit = () => {
+const onSubmit = () => {
     form.submit(route(''), {
         onSuccess: () => {
             close()
diff --git a/stubs/modal.stub b/stubs/modal.stub
index ee74668..12fb5c7 100644
--- a/stubs/modal.stub
+++ b/stubs/modal.stub
@@ -1,26 +1,34 @@
 <template>
+    <Head title="" />
     <Modal>
         <ModalBody>
             <ModalHeader>
                 <!-- Title -->
             </ModalHeader>
-
-            <!-- ... -->
-                
+            <ModalContent>
+                <!-- ... -->
+            </ModalContent>
+            <ModalFooter>
+                <SecondaryButton @click="close">
+                    Close
+                </SecondaryButton>
+            </ModalFooter>                
         </ModalBody>
     </Modal>
 </template>
 
 <script setup>
+import { Head } from '@inertiajs/vue3'
 import { ref } from 'vue'
 import { useModal } from 'momentum-modal'
-import Modal from '@/Components/Modal/Modal.vue';
-import ModalHeader from '@/Components/Modal/ModalHeader.vue';
-import ModalBody from '@/Components/Modal/ModalBody.vue';
+import { Modal, ModalBody ModalHeader, ModalContent, ModalFooter } from '@/Components/Modal';
+import { PrimaryButton, SecondaryButton } from '@/Components/Button
+import { Text } from '@/Components/Utility'
 
 const { close } = useModal()
 
 const props = defineProps({
-    
+    // name: Type
 })
+
 </script>
\ No newline at end of file
diff --git a/stubs/page.form.stub b/stubs/page.form.stub
index 6f8a078..e6e0bec 100644
--- a/stubs/page.form.stub
+++ b/stubs/page.form.stub
@@ -1,16 +1,21 @@
 <template>
     <Head title="New Page"></Head>
-
-    <!-- ... -->
-
+    <Form @submit.prevent="onSubmit">
+        <!-- ... -->
+        <div>
+            <PrimaryButton type="submit">
+                Create
+            </PrimaryButton>
+        </div>
+    </Form>
 </template>
 
 <script setup>
 import { Head, useForm } from '@inertiajs/vue3';
 import { ref } from 'vue';
 import MainLayout from '@/Layouts/MainLayout.vue';
-import SecondaryButton from '@/Components/Buttons/SecondaryButton.vue';
-import PrimaryButton from '@/Components/Buttons/PrimaryButton.vue';
+import { PrimaryButton, SecondaryButton } from '@/Components/Button
+import { Form, Field } from '@/Components/Form'
 
 defineOptions({ layout: MainLayout })
 
@@ -22,7 +27,7 @@ const form = useForm({
     // ...
 })
 
-const submit = () => {
+const onSubmit = () => {
     form.submit(route(''), {
         onSuccess: () => {
             close()
diff --git a/stubs/page.stub b/stubs/page.stub
index 563b3b2..af69296 100644
--- a/stubs/page.stub
+++ b/stubs/page.stub
@@ -1,5 +1,5 @@
 <template>
-    <Head title="New Page"></Head>
+    <Head title="New Page" />
 
     <!-- ... -->
 
