diff --git a/app/assets/tailwind/maybe-design-system.css b/app/assets/tailwind/maybe-design-system.css
index f7d90e4c..81839867 100644
--- a/app/assets/tailwind/maybe-design-system.css
+++ b/app/assets/tailwind/maybe-design-system.css
@@ -348,7 +348,7 @@
 @layer components {
   /* Buttons */
   .btn {
-    @apply px-3 py-2 rounded-lg text-sm font-medium cursor-pointer disabled:cursor-not-allowed focus:outline-gray-500;
+    @apply inline-flex items-center justify-center gap-2 px-3 py-2 rounded-lg text-sm font-medium cursor-pointer disabled:cursor-not-allowed focus:outline-gray-500;
     @apply transition-all duration-300;
   }
 
@@ -365,7 +365,7 @@
   }
   
   .btn--ghost {
-    @apply border border-transparent text-gray-900 hover:bg-gray-100;
+    @apply border border-transparent text-secondary hover:border hover:border-alpha-black-200 hover:bg-gray-50;
   }
 
   .btn--outline-destructive {
diff --git a/app/controllers/rules_controller.rb b/app/controllers/rules_controller.rb
index 3ba7c7a7..d1b4ac0d 100644
--- a/app/controllers/rules_controller.rb
+++ b/app/controllers/rules_controller.rb
@@ -9,13 +9,21 @@ class RulesController < ApplicationController
   end
 
   def new
-    actions = []
-
-    if params[:action_type]
-      actions << Rule::Action.new(action_type: params[:action_type], value: params[:action_value])
-    end
-
-    @rule = Current.family.rules.build(resource_type: params[:resource_type] || "transaction", actions: actions)
+    @rule = Current.family.rules.build(
+      resource_type: params[:resource_type] || "transaction",
+      conditions: [
+        Rule::Condition.new(
+          condition_type: params[:condition_type] || "transaction_amount",
+          value: params[:condition_value]
+        )
+      ],
+      actions: [
+        Rule::Action.new(
+          action_type: params[:action_type] || "set_transaction_category",
+          value: params[:action_value]
+        )
+      ]
+    )
   end
 
   def create
diff --git a/app/javascript/controllers/rule/actions_controller.js b/app/javascript/controllers/rule/actions_controller.js
new file mode 100644
index 00000000..815e027e
--- /dev/null
+++ b/app/javascript/controllers/rule/actions_controller.js
@@ -0,0 +1,55 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="rule--actions"
+export default class extends Controller {
+  static values = { actionExecutors: Array };
+  static targets = ["destroyField", "actionValue"];
+
+  remove(e) {
+    if (e.params.destroy) {
+      this.destroyFieldTarget.value = true;
+    } else {
+      this.element.remove();
+    }
+  }
+
+  handleActionTypeChange(e) {
+    const actionExecutor = this.actionExecutorsValue.find(
+      (executor) => executor.key === e.target.value,
+    );
+
+    if (actionExecutor.type === "select") {
+      this.#updateValueSelectFor(actionExecutor);
+      this.#showAndEnableValueSelect();
+    } else {
+      this.#hideAndDisableValueSelect();
+    }
+  }
+
+  get valueSelectEl() {
+    return this.actionValueTarget.querySelector("select");
+  }
+
+  #showAndEnableValueSelect() {
+    this.actionValueTarget.classList.remove("hidden");
+    this.valueSelectEl.disabled = false;
+  }
+
+  #hideAndDisableValueSelect() {
+    this.actionValueTarget.classList.add("hidden");
+    this.valueSelectEl.disabled = true;
+  }
+
+  #updateValueSelectFor(actionExecutor) {
+    // Clear existing options
+    this.valueSelectEl.innerHTML = "";
+
+    // Add new options
+    for (const option of actionExecutor.options) {
+      const optionEl = document.createElement("option");
+      optionEl.value = option[1];
+      optionEl.textContent = option[0];
+      this.valueSelectEl.appendChild(optionEl);
+    }
+  }
+}
diff --git a/app/javascript/controllers/rule/conditions_controller.js b/app/javascript/controllers/rule/conditions_controller.js
new file mode 100644
index 00000000..a3ebdce9
--- /dev/null
+++ b/app/javascript/controllers/rule/conditions_controller.js
@@ -0,0 +1,100 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="rule--conditions"
+export default class extends Controller {
+  static values = { conditionFilters: Array };
+  static targets = [
+    "destroyField",
+    "filterValue",
+    "operatorSelect",
+    "subConditionTemplate",
+    "subConditionsList",
+  ];
+
+  addSubCondition() {
+    const html = this.subConditionTemplateTarget.innerHTML.replaceAll(
+      "IDX_PLACEHOLDER",
+      this.#uniqueKey(),
+    );
+
+    this.subConditionsListTarget.insertAdjacentHTML("beforeend", html);
+  }
+
+  remove(e) {
+    if (e.params.destroy) {
+      this.destroyFieldTarget.value = true;
+    } else {
+      this.element.remove();
+    }
+  }
+
+  handleConditionTypeChange(e) {
+    const conditionFilter = this.conditionFiltersValue.find(
+      (filter) => filter.key === e.target.value,
+    );
+
+    if (conditionFilter.type === "select") {
+      this.#buildSelectFor(conditionFilter);
+    } else {
+      this.#buildTextInputFor(conditionFilter);
+    }
+
+    this.#updateOperatorsField(conditionFilter);
+  }
+
+  get valueInputEl() {
+    const textInput = this.filterValueTarget.querySelector("input");
+    const selectInput = this.filterValueTarget.querySelector("select");
+
+    return textInput || selectInput;
+  }
+
+  #updateOperatorsField(conditionFilter) {
+    this.operatorSelectTarget.innerHTML = "";
+
+    for (const operator of conditionFilter.operators) {
+      const optionEl = document.createElement("option");
+      optionEl.value = operator;
+      optionEl.textContent = operator;
+      this.operatorSelectTarget.appendChild(optionEl);
+    }
+  }
+
+  #buildSelectFor(conditionFilter) {
+    const selectEl = this.#convertFormFieldTo("select", this.valueInputEl);
+
+    for (const option of conditionFilter.options) {
+      const optionEl = document.createElement("option");
+      optionEl.value = option[1];
+      optionEl.textContent = option[0];
+      selectEl.appendChild(optionEl);
+    }
+
+    this.valueInputEl.replaceWith(selectEl);
+  }
+
+  #buildTextInputFor(conditionFilter) {
+    const textInput = this.#convertFormFieldTo("input", this.valueInputEl);
+    textInput.placeholder = "Enter a value";
+    textInput.type = conditionFilter.type; // "text" || "number"
+
+    this.valueInputEl.replaceWith(textInput);
+  }
+
+  #convertFormFieldTo(type, el) {
+    const priorClasses = el.classList;
+    const priorId = el.id;
+    const priorName = el.name;
+
+    const newFormField = document.createElement(type);
+    newFormField.classList.add(...priorClasses);
+    newFormField.id = priorId;
+    newFormField.name = priorName;
+
+    return newFormField;
+  }
+
+  #uniqueKey() {
+    return Math.random().toString(36).substring(2, 15);
+  }
+}
diff --git a/app/javascript/controllers/rule_controller.js b/app/javascript/controllers/rule_controller.js
deleted file mode 100644
index 79dd3cda..00000000
--- a/app/javascript/controllers/rule_controller.js
+++ /dev/null
@@ -1,169 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-
-// Connects to data-controller="rule"
-export default class extends Controller {
-  static values = {
-    registry: Object,
-  };
-
-  static targets = [
-    "newConditionTemplate",
-    "newActionTemplate",
-    "conditionsList",
-    "condition",
-    "actionsList",
-    "action",
-    "destroyField",
-    "operatorField",
-    "valueField",
-  ];
-
-  initialize() {
-    console.log(this.registryValue);
-  }
-
-  addCondition() {
-    const html = this.newConditionTemplateTarget.innerHTML.replaceAll(
-      "IDX_PLACEHOLDER",
-      this.#uniqueKey(),
-    );
-
-    this.conditionsListTarget.insertAdjacentHTML("beforeend", html);
-  }
-
-  handleConditionTypeChange(e) {
-    const definition = this.#getConditionFilterDefinition(e.target.value);
-    const conditionEl = this.#getEventConditionEl(e.target);
-    const valueFieldEl = this.#getFieldEl(this.valueFieldTargets, conditionEl);
-
-    this.#updateOperatorsField(definition, conditionEl);
-
-    if (definition.type === "select") {
-      const selectEl = this.#buildSelectInput(definition, valueFieldEl);
-      valueFieldEl.replaceWith(selectEl);
-    } else {
-      const inputEl = this.#buildTextInput(definition, valueFieldEl);
-      valueFieldEl.replaceWith(inputEl);
-    }
-  }
-
-  addAction() {
-    const html = this.newActionTemplateTarget.innerHTML.replaceAll(
-      "IDX_PLACEHOLDER",
-      this.#uniqueKey(),
-    );
-
-    this.actionsListTarget.insertAdjacentHTML("beforeend", html);
-  }
-
-  handleActionTypeChange(e) {
-    const definition = this.#getActionExecutorDefinition(e.target.value);
-    const actionEl = this.#getEventActionEl(e.target);
-    const valueFieldEl = this.#getFieldEl(this.valueFieldTargets, actionEl);
-
-    if (definition.type === "select") {
-      const selectEl = this.#buildSelectInput(definition, valueFieldEl);
-      valueFieldEl.replaceWith(selectEl);
-    } else {
-      valueFieldEl.classList.add("hidden");
-    }
-  }
-
-  removeCondition(e) {
-    const conditionEl = this.conditionTargets.find((el) => {
-      return el.contains(e.target);
-    });
-
-    if (e.params.destroy) {
-      this.#destroyRuleItem(conditionEl);
-    } else {
-      conditionEl.remove();
-    }
-  }
-
-  removeAction(e) {
-    const actionEl = this.actionTargets.find((el) => {
-      return el.contains(e.target);
-    });
-
-    if (e.params.destroy) {
-      this.#destroyRuleItem(actionEl);
-    } else {
-      actionEl.remove();
-    }
-  }
-
-  #updateOperatorsField(definition, conditionEl) {
-    const operatorFieldEl = this.#getFieldEl(
-      this.operatorFieldTargets,
-      conditionEl,
-    );
-
-    operatorFieldEl.innerHTML = definition.operators
-      .map((operator) => {
-        return `<option value="${operator}">${operator}</option>`;
-      })
-      .join("");
-  }
-
-  #buildTextInput(definition, fieldEl) {
-    const inputEl = document.createElement("input");
-    inputEl.setAttribute("data-rule-target", "valueField");
-    inputEl.setAttribute("name", fieldEl.name);
-    inputEl.setAttribute("id", fieldEl.id);
-    inputEl.setAttribute("type", definition.type);
-
-    return inputEl;
-  }
-
-  #buildSelectInput(definition, fieldEl) {
-    const selectEl = document.createElement("select");
-    selectEl.setAttribute("data-rule-target", "valueField");
-    selectEl.setAttribute("name", fieldEl.name);
-    selectEl.setAttribute("id", fieldEl.id);
-
-    definition.options.forEach((option) => {
-      const optionEl = document.createElement("option");
-      optionEl.textContent = option[0];
-      optionEl.value = option[1];
-      selectEl.appendChild(optionEl);
-    });
-
-    return selectEl;
-  }
-
-  #destroyRuleItem(itemEl) {
-    const destroyFieldEl = this.#getFieldEl(this.destroyFieldTargets, itemEl);
-
-    itemEl.classList.add("hidden");
-    destroyFieldEl.value = true;
-  }
-
-  #uniqueKey() {
-    return Date.now();
-  }
-
-  #getConditionFilterDefinition(key) {
-    return this.registryValue.filters.find((filter) => {
-      return filter.key === key;
-    });
-  }
-
-  #getActionExecutorDefinition(key) {
-    return this.registryValue.executors.find((executor) => {
-      return executor.key === key;
-    });
-  }
-
-  #getEventConditionEl(childEl) {
-    return this.conditionTargets.find((t) => t.contains(childEl));
-  }
-
-  #getEventActionEl(childEl) {
-    return this.actionTargets.find((t) => t.contains(childEl));
-  }
-
-  #getFieldEl(targets, containerEl) {
-    return targets.find((t) => containerEl.contains(t));
-  }
-}
diff --git a/app/javascript/controllers/rules_controller.js b/app/javascript/controllers/rules_controller.js
new file mode 100644
index 00000000..d92d0548
--- /dev/null
+++ b/app/javascript/controllers/rules_controller.js
@@ -0,0 +1,50 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="rules"
+export default class extends Controller {
+  static targets = [
+    "conditionTemplate",
+    "conditionGroupTemplate",
+    "actionTemplate",
+    "conditionsList",
+    "actionsList",
+    "effectiveDateInput",
+  ];
+
+  addConditionGroup() {
+    this.#appendTemplate(
+      this.conditionGroupTemplateTarget,
+      this.conditionsListTarget,
+    );
+  }
+
+  addCondition() {
+    this.#appendTemplate(
+      this.conditionTemplateTarget,
+      this.conditionsListTarget,
+    );
+  }
+
+  addAction() {
+    this.#appendTemplate(this.actionTemplateTarget, this.actionsListTarget);
+  }
+
+  clearEffectiveDate() {
+    this.effectiveDateInputTarget.value = "";
+  }
+
+  enableEffectiveDate() {}
+
+  #appendTemplate(templateEl, listEl) {
+    const html = templateEl.innerHTML.replaceAll(
+      "IDX_PLACEHOLDER",
+      this.#uniqueKey(),
+    );
+
+    listEl.insertAdjacentHTML("beforeend", html);
+  }
+
+  #uniqueKey() {
+    return Date.now();
+  }
+}
diff --git a/app/models/rule/condition.rb b/app/models/rule/condition.rb
index e280e750..33935317 100644
--- a/app/models/rule/condition.rb
+++ b/app/models/rule/condition.rb
@@ -5,6 +5,8 @@ class Rule::Condition < ApplicationRecord
   has_many :sub_conditions, class_name: "Rule::Condition", foreign_key: :parent_id, dependent: :destroy, inverse_of: :parent
 
   validates :condition_type, presence: true
+  validates :operator, presence: true
+  validates :value, presence: true, unless: -> { compound? }
 
   accepts_nested_attributes_for :sub_conditions, allow_destroy: true
 
diff --git a/app/views/rule/actions/_action.html.erb b/app/views/rule/actions/_action.html.erb
index 165528f6..0af732c3 100644
--- a/app/views/rule/actions/_action.html.erb
+++ b/app/views/rule/actions/_action.html.erb
@@ -2,21 +2,24 @@
 
 <% action = form.object %>
 <% rule = action.rule %>
+<% needs_value = action.executor.type == "select" %>
 
-<li data-rule-target="action">
-  <%= form.hidden_field :_destroy, value: false, data: { rule_target: "destroyField" } %>
-  <%= form.select :action_type, rule.action_executors.map { |executor| [ executor.label, executor.key ] }, {}, data: { action: "rule#handleActionTypeChange" } %>
+<li data-controller="rule--actions" data-rule--actions-action-executors-value="<%= rule.action_executors.to_json %>" class="flex items-center gap-3">
+  <%= form.hidden_field :_destroy, value: false, data: { rule__actions_target: "destroyField" } %>
 
-  <% if action.executor.type == "select" %>
-    <span>to</span>
-    <%= form.select :value, action.options, {}, data: { rule_target: "valueField" } %>
-  <% else %>
-    <%= form.hidden_field :value, data: { rule_target: "valueField" } %>
-  <% end %>
+  <div class="grow flex gap-2 items-center h-full">
+    <%= form.select :action_type, rule.action_executors.map { |executor| [ executor.label, executor.key ] }, {}, data: { action: "rule--actions#handleActionTypeChange" } %>
+
+    <%= tag.div class: class_names("flex items-center gap-2", "hidden" => !needs_value), 
+                data: { rule__actions_target: "actionValue" } do %>
+      <span class="font-medium uppercase text-xs">to</span>
+      <%= form.select :value, action.options, {}, disabled: !needs_value %>
+    <% end %>
+  </div>
 
   <button type="button"
-          data-action="rule#removeAction"
-          data-rule-destroy-param="<%= action.persisted? %>">
-    Remove
+          data-action="rule--actions#remove"
+          data-rule--actions-destroy-param="<%= action.persisted? %>">
+    <%= icon("trash-2", color: "gray", size: "sm") %>
   </button>
 </li>
diff --git a/app/views/rule/conditions/_condition.html.erb b/app/views/rule/conditions/_condition.html.erb
index c199cc76..ad1b0b9d 100644
--- a/app/views/rule/conditions/_condition.html.erb
+++ b/app/views/rule/conditions/_condition.html.erb
@@ -1,22 +1,34 @@
-<%# locals: (form:) %>
+<%# locals: (form:, show_prefix: true) %>
 
 <% condition = form.object %>
 <% rule = condition.rule %>
 
-<li data-rule-target="condition">
-  <%= form.hidden_field :_destroy, value: false, data: { rule_target: "destroyField" } %>
-  <%= form.select :condition_type, rule.condition_filters.map { |filter| [ filter.label, filter.key ] }, {}, data: { action: "rule#handleConditionTypeChange" } %>
-  <%= form.select :operator, condition.operators, {}, data: { rule_target: "operatorField" } %>
-
-  <% if condition.filter.type == "select" %>
-    <%= form.select :value, condition.options, {}, data: { rule_target: "valueField" } %>
-  <% else %>
-    <%= form.text_field :value, data: { rule_target: "valueField" } %>
+<li data-controller="rule--conditions" data-rule--conditions-condition-filters-value="<%= rule.condition_filters.to_json %>" class="flex items-center gap-3">
+  <% if form.index.to_i > 0 && show_prefix %>
+    <div class="pl-4">
+      <span class="font-medium uppercase text-xs">and</span>
+    </div>
   <% end %>
 
+  <div class="grow flex gap-2 items-center h-full">
+    <%= form.hidden_field :_destroy, value: false, data: { rule__conditions_target: "destroyField" } %>
+
+    <%= form.select :condition_type, rule.condition_filters.map { |filter| [ filter.label, filter.key ] }, {}, data: { action: "rule--conditions#handleConditionTypeChange" } %>
+
+    <%= form.select :operator, condition.operators, { container_class: "w-fit min-w-16" }, data: { rule__conditions_target: "operatorSelect" } %>
+
+    <div data-rule--conditions-target="filterValue">
+      <% if condition.filter.type == "select" %>
+        <%= form.select :value, condition.options, {} %>
+      <% else %>
+        <%= form.text_field :value, placeholder: "Enter a value" %>
+      <% end %>
+    </div>
+  </div>
+
   <button type="button"
-          data-action="rule#removeCondition"
-          data-rule-destroy-param="<%= condition.persisted? %>">
-    Remove
+          data-action="rule--conditions#remove"
+          data-rule--conditions-destroy-param="<%= condition.persisted? %>">
+    <%= icon("trash-2", color: "gray", size: "sm") %>
   </button>
 </li>
diff --git a/app/views/rule/conditions/_condition_group.html.erb b/app/views/rule/conditions/_condition_group.html.erb
index 1c959148..3da50432 100644
--- a/app/views/rule/conditions/_condition_group.html.erb
+++ b/app/views/rule/conditions/_condition_group.html.erb
@@ -1,15 +1,44 @@
 <%# locals: (form:) %>
 
 <% condition = form.object %>
+<% rule = condition.rule %>
 
-<li>
-  <% if condition.compound? %>
-    <ul class="border border-gray-200 p-2">
-      <%= form.fields_for :sub_conditions do |scf| %>
-        <%= render "rule/conditions/condition_group", form: scf %>
+<li data-controller="rule--conditions element-removal" class="border border-alpha-black-100 rounded-md p-4 space-y-3">
+
+  <%= form.hidden_field :condition_type, value: "compound" %>
+
+  <div class="flex items-center justify-between gap-2">
+    <div class="flex items-center gap-2">
+      <% unless form.index == 0 %>
+        <div class="pl-2">
+          <span class="font-medium uppercase text-xs">and</span>
+        </div>
       <% end %>
-    </ul>
-  <% else %>
-    <%= render "rule/conditions/condition", form: form %>
-  <% end %>
+      <p class="text-sm text-secondary">match</p>
+      <%= form.select :operator, [["all", "and"], ["any", "or"]], { container_class: "w-fit" }, data: { rules_target: "operatorField" } %>
+      <p class="text-sm text-secondary">of the following conditions</p>
+    </div>
+
+    <button type="button" data-action="element-removal#remove">
+      <%= icon("trash-2", color: "gray", size: "sm") %>
+    </button>
+  </div>
+
+  <%# Sub-condition template, used by Stimulus controller to add new sub-conditions dynamically %>
+  <template data-rule--conditions-target="subConditionTemplate">
+    <%= form.fields_for :sub_conditions, Rule::Condition.new(parent: condition, condition_type: rule.condition_filters.first.key), child_index: "IDX_PLACEHOLDER" do |scf| %>
+      <%= render "rule/conditions/condition", form: scf %>
+    <% end %>
+  </template>
+
+  <ul data-rule--conditions-target="subConditionsList" class="space-y-3">
+    <%= form.fields_for :sub_conditions do |scf| %>
+      <%= render "rule/conditions/condition", form: scf, show_prefix: false %>
+    <% end %>
+  </ul>
+
+  <button type="button" class="btn btn--ghost" data-action="rule--conditions#addSubCondition">
+    <%= icon("plus", color: "gray", size: "sm") %>
+    <span>Add condition</span>
+  </button>
 </li>
diff --git a/app/views/rules/_form.html.erb b/app/views/rules/_form.html.erb
index 1ce7984d..c0b7920c 100644
--- a/app/views/rules/_form.html.erb
+++ b/app/views/rules/_form.html.erb
@@ -1,11 +1,7 @@
 <%# locals: (rule:) %>
 
-<%= form_with model: rule,
-              class: "p-4 space-y-8 min-w-[600px]",
-              data: {
-                controller: "rule",
-                rule_registry_value: rule.registry.to_json
-              } do |f| %>
+<%= styled_form_with model: rule, class: "space-y-4",
+                     data: { controller: "rules", rule_registry_value: rule.registry.to_json } do |f| %>
 
   <%= f.hidden_field :resource_type, value: rule.resource_type %>
 
@@ -14,37 +10,56 @@
   <% end %>
 
   <section class="space-y-4">
-    <h3 class="mb-4 font-bold">Conditions</h3>
-    <hr>
+    <h3 class="text-sm font-medium">If <%= rule.resource_type %></h3>
 
-    <template data-rule-target="newConditionTemplate">
-      <%= f.fields_for :conditions, Rule::Condition.new(rule: rule, condition_type: rule.condition_filters.first.key), child_index: "IDX_PLACEHOLDER" do |cf| %>
+    <%# Condition template, used by Stimulus controller to add new conditions dynamically %>
+    <template data-rules-target="conditionGroupTemplate">
+      <%= f.fields_for :conditions, Rule::Condition.new(rule: rule, condition_type: "compound", operator: "and"), child_index: "IDX_PLACEHOLDER" do |cf| %>
         <%= render "rule/conditions/condition_group", form: cf %>
       <% end %>
     </template>
 
-    <ul data-rule-target="conditionsList">
-      <span>When</span>
+    <%# Condition template, used by Stimulus controller to add new conditions dynamically %>
+    <template data-rules-target="conditionTemplate">
+      <%= f.fields_for :conditions, Rule::Condition.new(rule: rule, condition_type: rule.condition_filters.first.key), child_index: "IDX_PLACEHOLDER" do |cf| %>
+        <%= render "rule/conditions/condition", form: cf %>
+      <% end %>
+    </template>
 
+    <ul data-rules-target="conditionsList" class="space-y-3 mb-4">
       <%= f.fields_for :conditions do |cf| %>
-        <%= render "rule/conditions/condition_group", form: cf %>
+        <% if cf.object.compound? %>
+          <%= render "rule/conditions/condition_group", form: cf %>
+        <% else %>
+          <%= render "rule/conditions/condition", form: cf %>
+        <% end %>
       <% end %>
     </ul>
 
-    <button type="button" data-action="rule#addCondition">Add condition</button>
+    <div class="flex items-center gap-2">
+      <button type="button" data-action="rules#addCondition" class="btn btn--ghost">
+        <%= icon("plus") %>
+        <span>Add condition</span>
+      </button>
+
+      <button type="button" data-action="rules#addConditionGroup" class="btn btn--ghost">
+        <%= icon("boxes") %>
+        <span>Add condition group</span>
+      </button>
+    </div>
   </section>
 
   <section class="space-y-4">
-    <h3 class="mb-4 font-bold">Actions</h3>
-    <hr>
+    <h3 class="text-sm font-medium">Then</h3>
 
-    <template data-rule-target="newActionTemplate">
+    <%# Action template, used by Stimulus controller to add new actions dynamically %>
+    <template data-rules-target="actionTemplate">
       <%= f.fields_for :actions, Rule::Action.new(rule: rule, action_type: rule.action_executors.first.key), child_index: "IDX_PLACEHOLDER" do |af| %>
         <%= render "rule/actions/action", form: af %>
       <% end %>
     </template>
 
-    <ul data-rule-target="actionsList">
+    <ul data-rules-target="actionsList" class="space-y-3">
       <%= f.fields_for :actions do |af| %>
         <%= render "rule/actions/action", form: af %>
       <% end %>
@@ -52,10 +67,32 @@
 
     <button
         type="button"
-        data-action="rule#addAction">
-      Add action
+        data-action="rules#addAction"
+        class="btn btn--ghost">
+      <%= icon("plus") %>
+      <span>Add action</span>
     </button>
   </section>
 
+  <section class="space-y-4">
+    <h3 class="text-sm font-medium">Apply this</h3>
+
+    <div class="space-y-2">
+      <div class="flex items-center gap-2">
+        <%= f.radio_button :effective_date_enabled, false, checked: rule.effective_date.nil?, data: { action: "rules#clearEffectiveDate" } %>
+        <%= f.label :effective_date_enabled_false, "To all past and future #{rule.resource_type}s" %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <div class="flex items-center gap-2">
+          <%= f.radio_button :effective_date_enabled, true, checked: rule.effective_date.present? %>
+          <%= f.label :effective_date_enabled_true, "Starting from" %>
+        </div>
+
+        <%= f.date_field :effective_date, container_class: "w-fit", data: { rules_target: "effectiveDateInput" } %>
+      </div>
+    </div>
+  </section>
+
   <%= f.submit %>
 <% end %>
diff --git a/app/views/rules/edit.html.erb b/app/views/rules/edit.html.erb
index 077462d4..e5693fa2 100644
--- a/app/views/rules/edit.html.erb
+++ b/app/views/rules/edit.html.erb
@@ -1,7 +1,5 @@
 <%= link_to "Back to rules", rules_path %>
 
-<%= modal do %>
-  <h2>Edit <%= @rule.resource_type %> rule</h2>
-
+<%= modal_form_wrapper title: "Edit #{@rule.resource_type} rule" do %>
   <%= render "rules/form", rule: @rule %>
 <% end %>
diff --git a/app/views/rules/new.html.erb b/app/views/rules/new.html.erb
index 334ae8a0..37205dd9 100644
--- a/app/views/rules/new.html.erb
+++ b/app/views/rules/new.html.erb
@@ -1,7 +1,5 @@
 <%= link_to "Back to rules", rules_path %>
 
-<%= modal do %>
-  <h2>New <%= @rule.resource_type %> rule</h2>
-
+<%= modal_form_wrapper title: "New #{@rule.resource_type} rule" do %>
   <%= render "rules/form", rule: @rule %>
 <% end %>
diff --git a/app/views/shared/_modal.html.erb b/app/views/shared/_modal.html.erb
index 72be6f0f..e0674716 100644
--- a/app/views/shared/_modal.html.erb
+++ b/app/views/shared/_modal.html.erb
@@ -1,6 +1,6 @@
 <%# locals: (content:, classes:) -%>
 <%= turbo_frame_tag "modal" do %>
-  <dialog class="focus:outline-none m-auto bg-white shadow-border-xs rounded-2xl max-w-[580px] w-min-content h-fit overflow-visible <%= classes %>" data-controller="modal" data-action="mousedown->modal#clickOutside">
+  <dialog class="focus:outline-none m-auto bg-white shadow-border-xs rounded-2xl max-w-[580px] w-min-content h-fit overflow-auto <%= classes %>" data-controller="modal" data-action="mousedown->modal#clickOutside">
     <div class="flex flex-col">
       <%= content %>
     </div>