diff --git a/.credo.exs b/.credo.exs
index 5f5071f4..c8b32b83 100644
--- a/.credo.exs
+++ b/.credo.exs
@@ -16,7 +16,10 @@
       parse_timeout: 5000,
       color: true,
       checks: %{
-        disabled: []
+        disabled: [],
+        enabled: [
+          {Credo.Check.Consistency.UnusedVariableNames, []}
+        ]
       }
     }
   ]
diff --git a/demo/lib/demo/short_link.ex b/demo/lib/demo/short_link.ex
index c5fa9918..d204363a 100644
--- a/demo/lib/demo/short_link.ex
+++ b/demo/lib/demo/short_link.ex
@@ -38,7 +38,7 @@ defmodule Demo.ShortLink do
   defp add_short_key(changeset) do
     case get_field(changeset, :short_key) do
       nil -> put_change(changeset, :short_key, generate_short_key())
-      _ -> changeset
+      _field -> changeset
     end
   end
 
diff --git a/lib/backpex/fields/has_many.ex b/lib/backpex/fields/has_many.ex
index d7d6bda2..66cdd05e 100644
--- a/lib/backpex/fields/has_many.ex
+++ b/lib/backpex/fields/has_many.ex
@@ -306,7 +306,7 @@ defmodule Backpex.Fields.HasMany do
       "" ->
         []
 
-      _ ->
+      _other ->
         nil
     end
   end
diff --git a/lib/backpex/html/layout.ex b/lib/backpex/html/layout.ex
index ce93ef0e..2b8680a4 100644
--- a/lib/backpex/html/layout.ex
+++ b/lib/backpex/html/layout.ex
@@ -130,6 +130,12 @@ defmodule Backpex.HTML.Layout do
       :if={Phoenix.Flash.get(@flash, :info) && Phoenix.Flash.get(@flash, :info) != ""}
       class="alert bg-info text-info-content my-4 text-sm"
       phx-value-key="info"
+      x-data="{ isVisible: false }"
+      x-init="() => { isVisible = true; setTimeout(() => isVisible = false, 5000) }"
+      x-show="isVisible"
+      x-transition:leave="transition ease-in duration-2000"
+      x-transition:leave-start="opacity-100 transform scale-100"
+      x-transition:leave-end="opacity-0 transform scale-90"
     >
       <Backpex.HTML.CoreComponents.icon name="hero-information-circle" class="h-5 w-5" />
       <span>
diff --git a/lib/backpex/html/resource/form_component.html.heex b/lib/backpex/html/resource/form_component.html.heex
index 94449962..a4f0386e 100644
--- a/lib/backpex/html/resource/form_component.html.heex
+++ b/lib/backpex/html/resource/form_component.html.heex
@@ -48,12 +48,24 @@
         </button>
       <% else %>
         <.link navigate={@live_resource.return_to(@socket, assigns, @live_action, @item)}>
-          <button type="button" class="btn btn-neutral btn-outline">
+          <button type="button" class="btn btn-ghost">
             <%= Backpex.translate("Cancel") %>
           </button>
         </.link>
         <button
+          :if={@continue_label}
           type="submit"
+          name="save-type"
+          value="continue"
+          class={["btn", if(form_errors?(@show_form_errors, @form), do: "btn-error", else: "btn-neutral btn-outline")]}
+          phx-disable-with={@continue_label <> "..."}
+        >
+          <%= @continue_label %>
+        </button>
+        <button
+          type="submit"
+          name="save-type"
+          value="save"
           class={["btn", if(form_errors?(@show_form_errors, @form), do: "btn-error", else: "btn-primary")]}
           phx-disable-with={@save_label <> "..."}
         >
diff --git a/lib/backpex/live_components/form_component.ex b/lib/backpex/live_components/form_component.ex
index 2debe011..330544da 100644
--- a/lib/backpex/live_components/form_component.ex
+++ b/lib/backpex/live_components/form_component.ex
@@ -18,6 +18,7 @@ defmodule Backpex.FormComponent do
       socket
       |> assign(assigns)
       |> assign_new(:action_type, fn -> nil end)
+      |> assign_new(:continue_label, fn -> nil end)
       |> assign_new(:show_form_errors, fn -> false end)
       |> update_assigns()
       |> assign_form()
@@ -54,6 +55,7 @@ defmodule Backpex.FormComponent do
   defp apply_action(socket, action) when action in [:edit, :new] do
     socket
     |> assign(:save_label, Backpex.translate("Save"))
+    |> assign(:continue_label, Backpex.translate("Save & Continue editing"))
   end
 
   defp apply_action(socket, :resource_action) do
@@ -174,7 +176,7 @@ defmodule Backpex.FormComponent do
     handle_item_action(socket, key, change)
   end
 
-  def handle_event("save", %{"change" => change}, socket) do
+  def handle_event("save", %{"change" => change, "save-type" => save_type}, socket) do
     %{assigns: %{live_action: live_action, fields: fields} = assigns} = socket
 
     change =
@@ -182,7 +184,7 @@ defmodule Backpex.FormComponent do
       |> put_upload_change(socket, :insert)
       |> drop_readonly_changes(fields, assigns)
 
-    handle_save(socket, live_action, change)
+    handle_save(socket, live_action, change, save_type)
   end
 
   def handle_event("save", %{"action-key" => key}, socket) do
@@ -205,7 +207,9 @@ defmodule Backpex.FormComponent do
     {:noreply, socket}
   end
 
-  defp handle_save(socket, :new, params) do
+  defp handle_save(socket, key, params, save_type \\ "save")
+
+  defp handle_save(socket, :new, params, save_type) do
     %{
       assigns:
         %{
@@ -231,7 +235,7 @@ defmodule Backpex.FormComponent do
 
     case Resource.insert(item, params, repo, fields, changeset_function, opts) do
       {:ok, item} ->
-        return_to = live_resource.return_to(socket, assigns, :new, item)
+        return_to = return_to_path(save_type, live_resource, socket, assigns, item, :new)
 
         socket =
           socket
@@ -256,7 +260,7 @@ defmodule Backpex.FormComponent do
     end
   end
 
-  defp handle_save(socket, :edit, params) do
+  defp handle_save(socket, :edit, params, save_type) do
     %{
       assigns:
         %{
@@ -283,7 +287,7 @@ defmodule Backpex.FormComponent do
 
     case Resource.update(item, params, repo, fields, changeset_function, opts) do
       {:ok, item} ->
-        return_to = live_resource.return_to(socket, assigns, :edit, item)
+        return_to = return_to_path(save_type, live_resource, socket, assigns, item, :edit)
         info_msg = Backpex.translate({"%{resource} has been edited successfully.", %{resource: singular_name}})
 
         socket =
@@ -309,7 +313,7 @@ defmodule Backpex.FormComponent do
     end
   end
 
-  defp handle_save(socket, :resource_action, params) do
+  defp handle_save(socket, :resource_action, params, _save_type) do
     %{
       assigns:
         %{
@@ -422,6 +426,22 @@ defmodule Backpex.FormComponent do
   defp flash_key(:ok), do: :info
   defp flash_key(:error), do: :error
 
+  defp return_to_path("continue", _live_resource, _socket, %{current_url: url}, item, :new) do
+    url
+    |> URI.parse()
+    |> Map.get(:path)
+    |> Path.dirname()
+    |> Kernel.<>("/#{item.id}/edit")
+  end
+
+  defp return_to_path("continue", _live_resource, _socket, %{current_url: url}, _item, :edit) do
+    URI.parse(url).path
+  end
+
+  defp return_to_path(_save_type, live_resource, socket, assigns, item, type) do
+    live_resource.return_to(socket, assigns, type, item)
+  end
+
   defp put_upload_change(change, socket, action) do
     Enum.reduce(socket.assigns.fields, change, fn
       {_name, %{upload_key: upload_key} = field_options} = _field, acc ->
diff --git a/lib/backpex/resource.ex b/lib/backpex/resource.ex
index 651f9a55..66e99538 100644
--- a/lib/backpex/resource.ex
+++ b/lib/backpex/resource.ex
@@ -567,7 +567,7 @@ defmodule Backpex.Resource do
           %{custom_alias: custom_alias} ->
             association |> Map.from_struct() |> Map.put(:custom_alias, custom_alias)
 
-          _ ->
+          _other ->
             association |> Map.from_struct()
         end
     end)