diff --git a/lib/mishka_template_creator/components/blocks/settings.ex b/lib/mishka_template_creator/components/blocks/settings.ex
index 7864861..038b1a5 100644
--- a/lib/mishka_template_creator/components/blocks/settings.ex
+++ b/lib/mishka_template_creator/components/blocks/settings.ex
@@ -1,8 +1,8 @@
 defmodule MishkaTemplateCreator.Components.Blocks.Settings do
   use Phoenix.Component
   alias Phoenix.LiveView.JS
-  import MishkaTemplateCreatorWeb.CoreComponents
 
+  import MishkaTemplateCreatorWeb.CoreComponents
   import MishkaTemplateCreatorWeb.MishkaCoreComponent
   alias MishkaTemplateCreator.{Components.Blocks.ElementMenu, Data.TailwindSetting}
 
@@ -31,8 +31,7 @@ defmodule MishkaTemplateCreator.Components.Blocks.Settings do
             title={title}
             phx-click="selected_setting"
             phx-value-id={id}
-            phx-value-type={@type}
-            phx-value-block-id={@block_id}
+            phx-value-child={nil}
           >
             <%= Phoenix.LiveView.HTMLEngine.component(
               Code.eval_string("&#{module}/1") |> elem(0),
@@ -81,59 +80,38 @@ defmodule MishkaTemplateCreator.Components.Blocks.Settings do
           </div>
           <hr />
 
-          <.create_form id={@selected_setting["id"]} />
+          <.create_form id={@selected_setting["id"]} child={@selected_setting["child"]} />
         </div>
       <% end %>
     </.push_modal>
     """
   end
 
-  attr :selected_setting, :map, required: true
-
-  @spec get_form(map) :: Phoenix.LiveView.Rendered.t()
-  def get_form(assigns) do
-    ~H"""
-    <.simple_form
-      :let={f}
-      for={%{}}
-      as={:setting_form}
-      phx-submit="save_setting"
-      phx-change="validate_setting"
-      class="z-40"
-    >
-      <.input field={f[:setting_form]} label="Tag Name" />
-      <:actions>
-        <.button class="phx-submit-loading:opacity-75 rounded-lg bg-zinc-900 hover:bg-zinc-700 py-2 px-3 text-sm font-semibold leading-6 text-white active:text-white/80 disabled:bg-gray-400 disabled:text-white disabled:outline-none">
-          Save
-        </.button>
-      </:actions>
-    </.simple_form>
-    """
-  end
-
   attr :id, :string, required: true
+  attr :child, :string, required: false, default: nil
 
-  defp create_form(%{id: id} = assigns) do
-    assigns =
-      assign(assigns, :selected_setting, Enum.find(TailwindSetting.call(), &(elem(&1, 0) == id)))
+  defp create_form(%{id: id, child: child} = assigns) do
+    assigns = assign(assigns, :selected_setting, TailwindSetting.get_form_options(id, child))
 
     ~H"""
     <div class="flex flex-row w-full max-h-80 overflow-y-scroll">
       <div class="flex flex-col mt-3 gap-2 w-1/3 border-r h-max pr-3">
         <.button
           :for={
-            {field_id, field_title, _field_description, _field_configs, _field_allowed_types} = _el <-
-              elem(@selected_setting, 3)
+            {field_id, field_title, _field_description, _field_configs, _field_allowed_types} <-
+              @selected_setting.section
           }
           id={field_id}
-          phx-click="select_config"
-          phx-value-id={field_id}
-          class="!bg-white border-b border-gray-300 shadow-sm text-gray-600 hover:bg-gray-400 hover:text-gray-400 w-full rounded-none"
+          phx-click="selected_setting"
+          phx-value-id={id}
+          phx-value-child={field_id}
+          class={"!bg-white border-b #{if field_id == @selected_setting.form_id, do: "border-gray-600", else: "border-gray-300"} shadow-sm text-gray-600 hover:bg-gray-400 hover:text-gray-400 w-full rounded-none"}
         >
           <%= field_title %>
         </.button>
       </div>
       <div class="flex flex-col w-2/3 p-3">
+        <%= @selected_setting.form_title %>
         <.form_block :let={f} for={%{}} as={:config_form} phx-change="save_config">
           <.input field={f[:config_form]} label="Tag Name" />
         </.form_block>
diff --git a/lib/mishka_template_creator/data/tailwind_setting.ex b/lib/mishka_template_creator/data/tailwind_setting.ex
index d564ddb..3b90758 100644
--- a/lib/mishka_template_creator/data/tailwind_setting.ex
+++ b/lib/mishka_template_creator/data/tailwind_setting.ex
@@ -8528,4 +8528,36 @@ defmodule MishkaTemplateCreator.Data.TailwindSetting do
   rescue
     _e -> ""
   end
+
+  def get_form_options(id, nil) do
+    found_section = elem(Enum.find(call(), &(elem(&1, 0) == id)), 3)
+
+    {field_id, field_title, field_description, field_configs, field_allowed_types} =
+      List.first(found_section)
+
+    %{
+      section: found_section,
+      form_id: field_id,
+      form_title: field_title,
+      form_description: field_description,
+      types: field_allowed_types,
+      field_configs: field_configs
+    }
+  end
+
+  def get_form_options(id, child) do
+    found_section = elem(Enum.find(call(), &(elem(&1, 0) == id)), 3)
+
+    {field_id, field_title, field_description, field_configs, field_allowed_types} =
+      Enum.find(found_section, &(elem(&1, 0) == child))
+
+    %{
+      section: found_section,
+      form_id: field_id,
+      form_title: field_title,
+      form_description: field_description,
+      types: field_allowed_types,
+      form_configs: field_configs
+    }
+  end
 end
diff --git a/lib/mishka_template_creator_web/live/template_creator_live.ex b/lib/mishka_template_creator_web/live/template_creator_live.ex
index b99d3f2..bad20aa 100644
--- a/lib/mishka_template_creator_web/live/template_creator_live.ex
+++ b/lib/mishka_template_creator_web/live/template_creator_live.ex
@@ -16,9 +16,6 @@ defmodule MishkaTemplateCreatorWeb.TemplateCreatorLive do
 
   # TODO: create multi layout sections and store in a Genserver or ETS
   # TODO: create multisection in a layout and store them under the layout
-  # TODO: Define some rules no to allow drag a layout in a section
-  # TODO: Define some rules not to allow drag another element in to empty space or layout without creating sections
-  # TODO: delete preView when on dragg
   def mount(_params, _, socket) do
     new_socket =
       assign(socket, elemens: [], selected_block: nil, submit: true, selected_setting: nil)
@@ -139,11 +136,7 @@ defmodule MishkaTemplateCreatorWeb.TemplateCreatorLive do
     {:noreply, socket}
   end
 
-  def handle_event(
-        "selected_setting",
-        %{"id" => _id, "type" => _type, "block-id" => _block_id} = params,
-        socket
-      ) do
+  def handle_event("selected_setting", params, socket) do
     {:noreply, assign(socket, :selected_setting, params)}
   end