diff --git a/src/components/DynamicComponent.vue b/src/components/DynamicComponent.vue
index c7dd827..b3762a7 100644
--- a/src/components/DynamicComponent.vue
+++ b/src/components/DynamicComponent.vue
@@ -1,15 +1,14 @@
 <template>
-  <div :id="componentId" @click="handleClick">
-    <component :is="componentType" v-bind="componentProps" :class="componentClass" :style="componentStyle">
-      {{ componentText }}
-      <template v-for="child in componentChildren" :key="child.id">
-        <DynamicComponent :component-data="child" />
-      </template>
-      <template v-for="(slot, key, index) in componentSlots" :key="index" v-slot:[key]>
-        <DynamicComponent :component-data="slot" />
-      </template>
-    </component>
-  </div>
+  <component @click.stop="handleClick" :id="componentId" :is="componentType" v-bind="componentProps"
+    :class="componentClass" :style="componentStyle">
+    {{ componentText }}
+    <template v-for="child in componentChildren" :key="child.id">
+      <DynamicComponent :component-data="child" />
+    </template>
+    <template v-for="(slot, key, index) in componentSlots" :key="index" v-slot:[key]>
+      <DynamicComponent :component-data="slot" />
+    </template>
+  </component>
 </template>
 <script setup lang="ts">
 import { defineProps, computed, onMounted } from 'vue';
diff --git a/src/components/MainView.vue b/src/components/MainView.vue
index ad097de..726e7c5 100644
--- a/src/components/MainView.vue
+++ b/src/components/MainView.vue
@@ -69,7 +69,7 @@ useDraggable(el2, componentsList, {
   },
   clone(element) {
     return {
-      id: uuid(),
+      id: `${element.type}-${uuid()}`,
       name: element.name,
       type: element.type,
       props: element.props,