diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js
index e5ffe65ff..191b85f9c 100644
--- a/assets/tailwind.config.js
+++ b/assets/tailwind.config.js
@@ -117,7 +117,7 @@ module.exports = {
       }, { values })
     }),
 
-    // Embeds Tabler icons (https://tablericons.com) into app.css bundle
+    // Embeds Tabler icons (https://tabler.io/icons) into app.css bundle
     plugin(function ({ matchComponents, theme }) {
       let iconsDir = path.join(__dirname, "../deps/tabler_icons/icons")
       let values = {}
diff --git a/lib/atomic/departments.ex b/lib/atomic/departments.ex
index 32be471ad..d0b7adb0a 100644
--- a/lib/atomic/departments.ex
+++ b/lib/atomic/departments.ex
@@ -194,19 +194,6 @@ defmodule Atomic.Departments do
     Repo.all(Collaborator)
   end
 
-  @doc """
-  Returns the list of collaborators belonging to an organization.
-
-  ## Examples
-
-      iex> list_collaborators_by_organization_id("99d7c9e5-4212-4f59-a097-28aaa33c2621")
-      [%Collaborator{}, ...]
-
-  """
-  def list_collaborators_by_organization_id(id) do
-    Repo.all(from p in Collaborator, where: p.organization_id == ^id)
-  end
-
   @doc """
   Gets a single collaborator.
 
@@ -363,14 +350,14 @@ defmodule Atomic.Departments do
 
   ## Examples
 
-      iex> list_collaborators_by_department_id("99d7c9e5-4212-4f59-a097-28aaa33c2621")
+      iex> list_department_collaborators(123)
       [%Collaborator{}, ...]
 
   """
-  def list_collaborators_by_department_id(id, opts \\ []) do
+  def list_department_collaborators(id, opts \\ []) do
     Collaborator
-    |> apply_filters(opts)
     |> where([c], c.department_id == ^id)
+    |> apply_filters(opts)
     |> Repo.all()
   end
 
diff --git a/lib/atomic/location/location.ex b/lib/atomic/location/location.ex
index 3b6234f43..673bd7e57 100644
--- a/lib/atomic/location/location.ex
+++ b/lib/atomic/location/location.ex
@@ -19,4 +19,7 @@ defmodule Atomic.Location do
     |> cast(attrs, @required_fields ++ @optional_fields)
     |> validate_required(@required_fields)
   end
+
+  def link(location) when is_map_key(location, :url), do: location.url
+  def link(location), do: "https://www.google.com/maps/search/?api=1&query=#{location.name}"
 end
diff --git a/lib/atomic/organizations.ex b/lib/atomic/organizations.ex
index e2c58e8ae..78e8b8612 100644
--- a/lib/atomic/organizations.ex
+++ b/lib/atomic/organizations.ex
@@ -136,17 +136,25 @@ defmodule Atomic.Organizations do
   end
 
   @doc """
-  Returns the list of organizations where an user is an admin or owner.
+  Returns the list of organizations which are connected with the user.
+  By default, it returns the organizations where the user is an admin or owner.
 
   ## Examples
 
-      iex> list_user_organizations(user_id)
+      iex> list_user_organizations(123)
       [%Organization{}, ...]
+
+      iex> list_user_organizations(456)
+      []
+
+      iex> list_user_organizations(123, [:follower])
+      [%Organization{}, ...]
+
   """
-  def list_user_organizations(user_id, opts \\ []) do
+  def list_user_organizations(user_id, roles \\ [:admin, :owner], opts \\ []) do
     Organization
     |> join(:inner, [o], m in Membership, on: m.organization_id == o.id)
-    |> where([o, m], m.user_id == ^user_id and m.role in [:admin, :owner])
+    |> where([o, m], m.user_id == ^user_id and m.role in ^roles)
     |> apply_filters(opts)
     |> Repo.all()
   end
@@ -256,43 +264,51 @@ defmodule Atomic.Organizations do
   end
 
   @doc """
-  Returns the list of memberships.
+  Returns the list of members in an organization.
+  A member is someone who is connected to the organization with a role other than `:follower`.
 
   ## Examples
 
-      iex> list_memberships(%{"organization_id" => id})
-      [%Organization{}, ...]
-
-      iex> list_memberships(%{"user_id" => id})
+      iex> list_memberships(123)
       [%Organization{}, ...]
 
   """
-  def list_memberships(params, preloads \\ [])
-
-  def list_memberships(%{"organization_id" => organization_id}, preloads) do
+  def list_memberships(organization_id, opts \\ []) do
     Membership
-    |> where([a], a.organization_id == ^organization_id and a.role != :follower)
+    |> where([m], m.organization_id == ^organization_id and m.role != :follower)
+    |> apply_filters(opts)
     |> Repo.all()
-    |> Repo.preload(preloads)
   end
 
-  def list_memberships(%{"user_id" => user_id}, preloads) do
+  @doc """
+  Counts the number of members in an organization.
+  A member is someone who is connected to the organization with a role other than `:follower`.
+
+  ## Examples
+
+      iex> count_memberships(123)
+      5
+
+      iex> count_memberships(456)
+      0
+
+  """
+  def count_memberships(organization_id) do
     Membership
-    |> where([a], a.user_id == ^user_id)
-    |> Repo.preload(preloads)
-    |> Repo.all()
+    |> where([m], m.organization_id == ^organization_id and m.role != :follower)
+    |> Repo.count()
   end
 
   @doc """
-    Verifies if an user is a member of an organization.
+  Verifies if an user is a member of an organization.
 
-    ## Examples
+  ## Examples
 
-        iex> member_of?(user, organization)
-        true
+      iex> member_of?(user, organization)
+      true
 
-        iex> member_of?(user, organization)
-        false
+      iex> member_of?(user, organization)
+      false
 
   """
   def member_of?(%User{} = user, %Organization{} = organization) do
@@ -301,6 +317,27 @@ defmodule Atomic.Organizations do
     |> Repo.exists?()
   end
 
+  @doc """
+  Checks if an user is following an organization.
+
+  ## Examples
+
+      iex> user_following?(123, 456)
+      true
+
+      iex> user_following?(456, 789)
+      false
+
+  """
+  def user_following?(user_id, organization_id) do
+    Membership
+    |> where(
+      [m],
+      m.user_id == ^user_id and m.organization_id == ^organization_id and m.role == :follower
+    )
+    |> Repo.exists?()
+  end
+
   @doc """
   Gets an user role in an organization.
 
@@ -453,19 +490,7 @@ defmodule Atomic.Organizations do
     |> Repo.aggregate(:count, :id)
   end
 
-  @doc """
-  Returns the amount of members in an organization.
-
-  ## Examples
-
-      iex> get_total_organization_members(organization_id)
-      5
-
-  """
-  def get_total_organization_members(organization_id) do
-    from(m in Membership, where: m.organization_id == ^organization_id)
-    |> Repo.aggregate(:count, :id)
-  end
+  ## Announcements
 
   @doc """
   Returns the list of announcements.
diff --git a/lib/atomic/organizations/membership.ex b/lib/atomic/organizations/membership.ex
index 22c058eb1..29dfe52ef 100644
--- a/lib/atomic/organizations/membership.ex
+++ b/lib/atomic/organizations/membership.ex
@@ -9,7 +9,7 @@ defmodule Atomic.Organizations.Membership do
     * `admin` - The user can control the organization's departments, activities and partners.
     * `follower` - The user is following the organization.
 
-  This schema can be further extended to include additional roles, such as `member`.
+  This schema can be further extended to include additional roles, such as `member` (with even different denominations).
   """
   use Atomic.Schema
 
@@ -34,6 +34,19 @@ defmodule Atomic.Organizations.Membership do
     organization
     |> cast(attrs, @required_fields ++ @optional_fields)
     |> validate_required(@required_fields)
+    |> prepare_changes(&maybe_increment_follower_count/1)
+  end
+
+  defp maybe_increment_follower_count(changeset) do
+    organization_id = get_change(changeset, :organization_id)
+    role = get_change(changeset, :role)
+
+    if organization_id && role && role == :follower do
+      query = from Organization, where: [id: ^organization_id]
+      changeset.repo.update_all(query, inc: [follower_count: 1])
+    end
+
+    changeset
   end
 
   def roles, do: @roles
diff --git a/lib/atomic/organizations/organization.ex b/lib/atomic/organizations/organization.ex
index 9db7602bb..c52e61007 100644
--- a/lib/atomic/organizations/organization.ex
+++ b/lib/atomic/organizations/organization.ex
@@ -3,17 +3,16 @@ defmodule Atomic.Organizations.Organization do
   use Atomic.Schema
 
   alias Atomic.Accounts.User
-  alias Atomic.Location
   alias Atomic.Organizations.{Announcement, Department, Membership, Partner}
-  alias Atomic.Uploaders
+  alias Atomic.{Socials, Uploaders}
 
-  @required_fields ~w(name long_name description)a
-  @optional_fields ~w()a
+  @required_fields ~w(name email long_name description)a
+  @optional_fields ~w(location)a
 
   @derive {
     Flop.Schema,
-    filterable: [],
-    sortable: [:name],
+    filterable: [:name],
+    sortable: [:name, :follower_count],
     compound_fields: [search: [:name]],
     default_order: %{
       order_by: [:name],
@@ -23,11 +22,18 @@ defmodule Atomic.Organizations.Organization do
 
   schema "organizations" do
     field :name, :string
+    field :email, :string
     field :long_name, :string
     field :description, :string
 
     field :logo, Uploaders.Logo.Type
-    embeds_one :location, Location, on_replace: :delete
+    field :location, :string
+
+    # field used to better track the number of followers
+    # can only be updated by the system and through the memberships schema
+    field :follower_count, :integer, default: 0
+
+    embeds_one :socials, Socials, on_replace: :update
 
     has_many :departments, Department,
       on_replace: :delete_if_exists,
@@ -51,7 +57,7 @@ defmodule Atomic.Organizations.Organization do
   def changeset(organization, attrs) do
     organization
     |> cast(attrs, @required_fields ++ @optional_fields)
-    |> cast_embed(:location, with: &Location.changeset/2)
+    |> cast_embed(:socials, with: &Socials.changeset/2)
     |> validate_required(@required_fields)
     |> unique_constraint(:name)
   end
diff --git a/lib/atomic/repo.ex b/lib/atomic/repo.ex
index f5ed46269..85f49def5 100644
--- a/lib/atomic/repo.ex
+++ b/lib/atomic/repo.ex
@@ -4,4 +4,6 @@ defmodule Atomic.Repo do
     adapter: Ecto.Adapters.Postgres
 
   use Paginator
+
+  def count(query), do: aggregate(query, :count)
 end
diff --git a/lib/atomic/socials/socials.ex b/lib/atomic/socials/socials.ex
index 4c82efcdc..b58af1bf5 100644
--- a/lib/atomic/socials/socials.ex
+++ b/lib/atomic/socials/socials.ex
@@ -1,19 +1,20 @@
 defmodule Atomic.Socials do
   @moduledoc """
-  A socials embedded struct schema.
+  An embedded schema for social media handles or links.
+
+  This schema stores the information just as it is, without any processing.
   """
   use Atomic.Schema
 
-  @optional_fields ~w(instagram facebook x youtube tiktok website)a
+  @optional_fields ~w(facebook instagram x linkedin website)a
 
   @derive Jason.Encoder
   @primary_key false
   embedded_schema do
-    field :instagram, :string
     field :facebook, :string
+    field :instagram, :string
     field :x, :string
-    field :youtube, :string
-    field :tiktok, :string
+    field :linkedin, :string
     field :website, :string
   end
 
@@ -22,4 +23,55 @@ defmodule Atomic.Socials do
     |> cast(attrs, @optional_fields)
     |> validate_format(:website, ~r{^https?://}, message: "must start with http:// or https://")
   end
+
+  def link(:facebook, handle), do: "https://facebook.com/#{handle}"
+  def link(:instagram, handle), do: "https://instagram.com/#{handle}"
+  def link(:x, handle), do: "https://x.com/#{handle}"
+  def link(:linkedin, handle), do: "https://linkedin.com/#{handle}"
+
+  @doc """
+  Function providing SVG icons for social media platforms with a default size of 4 tailwind units.
+
+  ## Examples
+
+    iex> Socials.icon(:facebook) |> raw()
+    ...
+
+    iex> Socials.icon(:instagram, 6) |> raw()
+    ...
+
+  """
+  def icon(platform, size \\ 4)
+
+  def icon(:facebook, size) do
+    """
+    <svg class="size-#{size}" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+      <path fill-rule="evenodd" d="M22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 4.991 3.657 9.128 8.438 9.878v-6.987h-2.54V12h2.54V9.797c0-2.506 1.492-3.89 3.777-3.89 1.094 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.562V12h2.773l-.443 2.89h-2.33v6.988C18.343 21.128 22 16.991 22 12z" clip-rule="evenodd" />
+    </svg>
+    """
+  end
+
+  def icon(:instagram, size) do
+    """
+    <svg class="size-#{size}" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+      <path fill-rule="evenodd" d="M12.315 2c2.43 0 2.784.013 3.808.06 1.064.049 1.791.218 2.427.465a4.902 4.902 0 011.772 1.153 4.902 4.902 0 011.153 1.772c.247.636.416 1.363.465 2.427.048 1.067.06 1.407.06 4.123v.08c0 2.643-.012 2.987-.06 4.043-.049 1.064-.218 1.791-.465 2.427a4.902 4.902 0 01-1.153 1.772 4.902 4.902 0 01-1.772 1.153c-.636.247-1.363.416-2.427.465-1.067.048-1.407.06-4.123.06h-.08c-2.643 0-2.987-.012-4.043-.06-1.064-.049-1.791-.218-2.427-.465a4.902 4.902 0 01-1.772-1.153 4.902 4.902 0 01-1.153-1.772c-.247-.636-.416-1.363-.465-2.427-.047-1.024-.06-1.379-.06-3.808v-.63c0-2.43.013-2.784.06-3.808.049-1.064.218-1.791.465-2.427a4.902 4.902 0 011.153-1.772A4.902 4.902 0 015.45 2.525c.636-.247 1.363-.416 2.427-.465C8.901 2.013 9.256 2 11.685 2h.63zm-.081 1.802h-.468c-2.456 0-2.784.011-3.807.058-.975.045-1.504.207-1.857.344-.467.182-.8.398-1.15.748-.35.35-.566.683-.748 1.15-.137.353-.3.882-.344 1.857-.047 1.023-.058 1.351-.058 3.807v.468c0 2.456.011 2.784.058 3.807.045.975.207 1.504.344 1.857.182.466.399.8.748 1.15.35.35.683.566 1.15.748.353.137.882.3 1.857.344 1.054.048 1.37.058 4.041.058h.08c2.597 0 2.917-.01 3.96-.058.976-.045 1.505-.207 1.858-.344.466-.182.8-.398 1.15-.748.35-.35.566-.683.748-1.15.137-.353.3-.882.344-1.857.048-1.055.058-1.37.058-4.041v-.08c0-2.597-.01-2.917-.058-3.96-.045-.976-.207-1.505-.344-1.858a3.097 3.097 0 00-.748-1.15 3.098 3.098 0 00-1.15-.748c-.353-.137-.882-.3-1.857-.344-1.023-.047-1.351-.058-3.807-.058zM12 6.865a5.135 5.135 0 110 10.27 5.135 5.135 0 010-10.27zm0 1.802a3.333 3.333 0 100 6.666 3.333 3.333 0 000-6.666zm5.338-3.205a1.2 1.2 0 110 2.4 1.2 1.2 0 010-2.4z" clip-rule="evenodd" />
+    </svg>
+    """
+  end
+
+  def icon(:x, size) do
+    """
+    <svg class="size-#{size}" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+      <path d="M13.6823 10.6218L20.2391 3H18.6854L12.9921 9.61788L8.44486 3H3.2002L10.0765 13.0074L3.2002 21H4.75404L10.7663 14.0113L15.5685 21H20.8131L13.6819 10.6218H13.6823ZM11.5541 13.0956L10.8574 12.0991L5.31391 4.16971H7.70053L12.1742 10.5689L12.8709 11.5655L18.6861 19.8835H16.2995L11.5541 13.096V13.0956Z" />
+    </svg>
+    """
+  end
+
+  def icon(:linkedin, size) do
+    """
+    <svg class="size-#{size} fill="currentColor" viewBox="0 0 24 24" aria-hidden="true"">
+      <path d="M18.335 18.339H15.67v-4.177c0-.996-.02-2.278-1.39-2.278-1.389 0-1.601 1.084-1.601 2.205v4.25h-2.666V9.75h2.56v1.17h.035c.358-.674 1.228-1.387 2.528-1.387 2.7 0 3.2 1.778 3.2 4.091v4.715zM7.003 8.575a1.546 1.546 0 01-1.548-1.549 1.548 1.548 0 111.547 1.549zm1.336 9.764H5.666V9.75H8.34v8.589zM19.67 3H4.329C3.593 3 3 3.58 3 4.297v15.406C3 20.42 3.594 21 4.328 21h15.338C20.4 21 21 20.42 21 19.703V4.297C21 3.58 20.4 3 19.666 3h.003z"></path>
+    </svg>
+    """
+  end
 end
diff --git a/lib/atomic_web.ex b/lib/atomic_web.ex
index 6e7292c9e..01169a362 100644
--- a/lib/atomic_web.ex
+++ b/lib/atomic_web.ex
@@ -106,6 +106,11 @@ defmodule AtomicWeb do
       import Phoenix.LiveView.Helpers
       import Phoenix.Component
 
+      alias Phoenix.LiveView.JS
+
+      # Import commonly used components
+      unquote(components())
+
       # Import basic rendering functionality (render, render_layout, etc)
       import Phoenix.View
 
diff --git a/lib/atomic_web/components/avatar.ex b/lib/atomic_web/components/avatar.ex
index 88e1ffb22..d35a3db91 100644
--- a/lib/atomic_web/components/avatar.ex
+++ b/lib/atomic_web/components/avatar.ex
@@ -36,7 +36,7 @@ defmodule AtomicWeb.Components.Avatar do
       :light,
       :dark
     ],
-    doc: "Avatar color."
+    doc: "Background color of the avatar."
 
   attr :class, :string, default: "", doc: "Additional classes to apply to the component."
 
diff --git a/lib/atomic_web/components/dropdown.ex b/lib/atomic_web/components/dropdown.ex
index 449ecbf25..4fab96436 100644
--- a/lib/atomic_web/components/dropdown.ex
+++ b/lib/atomic_web/components/dropdown.ex
@@ -4,9 +4,10 @@ defmodule AtomicWeb.Components.Dropdown do
   """
   use Phoenix.Component
 
-  import AtomicWeb.Components.Icon
   alias Phoenix.LiveView.JS
 
+  import AtomicWeb.Components.Icon
+
   attr :id, :string, required: true, doc: "The id of the dropdown."
 
   attr :items, :list, default: [], doc: "The items to display in the dropdown."
@@ -22,7 +23,7 @@ defmodule AtomicWeb.Components.Dropdown do
 
   def dropdown(assigns) do
     ~H"""
-    <div class="relative inline-block text-left" phx-click-away={JS.hide(to: "##{@id}", transition: {"ease-in duration-75", "transform opacity-100 scale-100", "transform opacity-0 scale-95"})}>
+    <div class="relative inline-block text-left" phx-click-away={hide(@id)}>
       <div phx-click={JS.toggle(to: "##{@id}", in: {"ease-out duration-100", "transform opacity-0 scale-95", "transform opacity-100 scale-100"}, out: {"ease-in duration-75", "transform opacity-100 scale-100", "transform opacity-0 scale-95"}, display: "block")}>
         {render_slot(@wrapper)}
       </div>
@@ -30,21 +31,7 @@ defmodule AtomicWeb.Components.Dropdown do
         <div class="py-1" role="menu" aria-orientation="vertical" aria-labelledby="options-menu">
           <%= for item <- @items do %>
             <%= if item[:patch] || item[:navigate] || item[:href] || item[:phx_click] do %>
-              <.link
-                patch={item[:patch]}
-                navigate={item[:navigate]}
-                href={item[:href]}
-                phx-click={
-                  if item[:phx_click] do
-                    JS.push(item[:phx_click]) |> JS.hide(to: "##{@id}", transition: {"ease-in duration-75", "transform opacity-100 scale-100", "transform opacity-0 scale-95"})
-                  else
-                    JS.hide(to: "##{@id}", transition: {"ease-in duration-75", "transform opacity-100 scale-100", "transform opacity-0 scale-95"})
-                  end
-                }
-                class={"#{item[:class]} flex items-center gap-x-2 px-4 py-2 text-sm text-zinc-700 hover:bg-zinc-100 hover:text-zinc-900"}
-                role="menuitem"
-                method={Map.get(item, :method, "get")}
-              >
+              <.link patch={item[:patch]} navigate={item[:navigate]} href={item[:href]} phx-click={maybe_phx_click(item, @id)} class={"#{item[:class]} flex items-center gap-x-2 px-4 py-2 text-sm text-zinc-700 hover:bg-zinc-100 hover:text-zinc-900"} role="menuitem" method={Map.get(item, :method, "get")}>
                 <%= if item[:icon] do %>
                   <.icon name={item.icon} class="size-5 ml-2 inline-block" />
                 <% end %>
@@ -64,4 +51,32 @@ defmodule AtomicWeb.Components.Dropdown do
     </div>
     """
   end
+
+  defp maybe_phx_click(item, id) when is_map_key(item, :phx_click) do
+    if item[:value] do
+      JS.push(item[:phx_click], value: item[:value]) |> hide(id)
+    else
+      JS.push(item[:phx_click])
+    end
+  end
+
+  defp maybe_phx_click(_item, id), do: hide(id)
+
+  defp hide(id),
+    do:
+      JS.hide(
+        to: "##{id}",
+        transition:
+          {"ease-in duration-75", "transform opacity-100 scale-100",
+           "transform opacity-0 scale-95"}
+      )
+
+  defp hide(event, id) do
+    event
+    |> JS.hide(
+      to: "##{id}",
+      transition:
+        {"ease-in duration-75", "transform opacity-100 scale-100", "transform opacity-0 scale-95"}
+    )
+  end
 end
diff --git a/lib/atomic_web/components/forms.ex b/lib/atomic_web/components/forms.ex
index a6020ea07..67cbf6e3d 100644
--- a/lib/atomic_web/components/forms.ex
+++ b/lib/atomic_web/components/forms.ex
@@ -43,8 +43,15 @@ defmodule AtomicWeb.Components.Forms do
   """
   attr :id, :any, default: nil, doc: "The id of the input. If not provided, it will be generated."
   attr :name, :any, doc: "The name of the input. If not provided, it will be generated."
-  attr :label, :string, doc: "The label for the input. If not provided, it will be generated."
-  attr :value, :any, doc: "The value of the input. If not provided, it will be generated."
+
+  attr :label, :string,
+    doc: "The label for the input. If not provided, it will be generated.",
+    default: ""
+
+  attr :value, :any,
+    doc: "The value of the input. If not provided, it will be generated.",
+    default: ""
+
   attr :type, :string, default: "text", values: @input_types, doc: "The type of the input."
 
   attr :field, HTML.FormField,
diff --git a/lib/atomic_web/components/icon.ex b/lib/atomic_web/components/icon.ex
index 124270b59..64e4c3b44 100644
--- a/lib/atomic_web/components/icon.ex
+++ b/lib/atomic_web/components/icon.ex
@@ -2,7 +2,7 @@ defmodule AtomicWeb.Components.Icon do
   @moduledoc """
   A component for rendering icons.
 
-  An icon can either be from the [Heroicons](https://heroicons.com) or [Tabler Icons](https://tablericons.com) set.
+  An icon can either be from the [Heroicons](https://heroicons.com) or [Tabler Icons](https://tabler.io/icons) set.
   """
   use Phoenix.Component
 
diff --git a/lib/atomic_web/components/page.ex b/lib/atomic_web/components/page.ex
index b39ebe303..78b0bb309 100644
--- a/lib/atomic_web/components/page.ex
+++ b/lib/atomic_web/components/page.ex
@@ -5,28 +5,39 @@ defmodule AtomicWeb.Components.Page do
   use Phoenix.Component
 
   attr :title, :string, required: true, doc: "The title of the page."
+  attr :description, :string, required: false, default: nil, doc: "The description of the page."
 
   attr :bottom_border, :boolean,
     default: false,
     doc: "Whether to show a bottom border after the page header."
 
+  slot :header, required: false, doc: "Slot for content to be rendered as the page header."
+
   slot :actions, required: false, doc: "Slot for actions to be rendered in the page header."
   slot :inner_block, required: false, doc: "Slot for the body content of the page."
 
   def page(assigns) do
     ~H"""
+    <%= render_slot(@header) %>
+
     <div class="flex min-h-full flex-col items-stretch justify-between lg:flex-row">
       <div class="min-h-[100vh] flex w-full flex-col bg-white lg:flex-row lg:border-r">
         <main class="relative z-0 mb-10 flex-1 overflow-y-auto focus:outline-none xl:order-last">
           <div class={["mx-auto max-w-5xl px-4 sm:px-6 lg:px-8", @bottom_border && "border-b"]}>
             <div class="my-6 flex min-w-0 flex-row items-center justify-between">
-              <h1 class="flex-1 select-none truncate text-2xl font-bold text-zinc-900">
-                {@title}
-              </h1>
-              {render_slot(@actions)}
+              <div class="flex flex-col">
+                <h1 class="flex-1 select-none truncate text-2xl font-bold text-zinc-900">
+                  <%= @title %>
+                </h1>
+                <h3 :if={@description} class="flex-1 select-none truncate text-sm font-medium text-zinc-500">
+                  <%= @description %>
+                </h3>
+              </div>
+              <div class="flex space-x-4">
+                <%= render_slot(@actions) %>
+              </div>
             </div>
           </div>
-
           {render_slot(@inner_block)}
         </main>
       </div>
diff --git a/lib/atomic_web/components/tabs.ex b/lib/atomic_web/components/tabs.ex
index 001cf4d9d..12c733b29 100644
--- a/lib/atomic_web/components/tabs.ex
+++ b/lib/atomic_web/components/tabs.ex
@@ -2,16 +2,25 @@ defmodule AtomicWeb.Components.Tabs do
   @moduledoc false
   use AtomicWeb, :component
 
-  attr :class, :string, default: "", doc: "The class to apply to the tabs"
   attr :underline, :boolean, default: true, doc: "Whether to show a bottom border on the tabs"
+  attr :class, :string, default: "", doc: "The class to apply to the tabs"
   attr :rest, :global
+
   slot :inner_block, required: false
 
   def tabs(assigns) do
     ~H"""
-    <div {@rest} class={["flex gap-x-8 gap-y-2", @underline && "border-b border-zinc-200", @class]} aria-label="Tabs">
-      {render_slot(@inner_block)}
-    </div>
+    <nav
+      {@rest}
+      class={[
+        "flex gap-x-8 gap-y-2",
+        @underline && "border-b border-zinc-200",
+        @class
+      ]}
+      aria-label="Tabs"
+    >
+      <%= render_slot(@inner_block) %>
+    </nav>
     """
   end
 
@@ -71,13 +80,13 @@ defmodule AtomicWeb.Components.Tabs do
 
     active_classes =
       if active,
-        do: "text-white bg-primary-600",
-        else: "text-white bg-zinc-500"
+        do: "text-white bg-orange-600",
+        else: "text-white bg-gray-500"
 
     underline_classes =
       if active,
-        do: "bg-primary-100 text-primary-600",
-        else: "text-zinc-500 bg-zinc-100"
+        do: "bg-orange-100 text-orange-600",
+        else: "text-gray-500 bg-gray-100"
 
     [base_classes, active_classes, underline_classes]
   end
@@ -88,7 +97,7 @@ defmodule AtomicWeb.Components.Tabs do
     active_classes =
       if active,
         do: "text-white bg-primary-600",
-        else: "text-white bg-zinc-500"
+        else: "text-white bg-gray-500"
 
     [base_classes, active_classes]
   end
diff --git a/lib/atomic_web/config.ex b/lib/atomic_web/config.ex
index 36c97e160..dba55706d 100644
--- a/lib/atomic_web/config.ex
+++ b/lib/atomic_web/config.ex
@@ -40,7 +40,7 @@ defmodule AtomicWeb.Config do
         %{
           key: :partners,
           title: "Partners",
-          icon: "hero-user-group",
+          icon: "tabler-heart-handshake",
           url: ~p"/organizations/#{current_organization}/partners",
           tabs: []
         }
diff --git a/lib/atomic_web/live/department_live/index.ex b/lib/atomic_web/live/department_live/index.ex
index 55e050910..bb8adca7d 100644
--- a/lib/atomic_web/live/department_live/index.ex
+++ b/lib/atomic_web/live/department_live/index.ex
@@ -47,7 +47,7 @@ defmodule AtomicWeb.DepartmentLive.Index do
     |> Enum.map(fn department ->
       collaborators =
         department.id
-        |> Departments.list_collaborators_by_department_id(
+        |> Departments.list_department_collaborators(
           preloads: [:user],
           where: [accepted: true]
         )
@@ -62,7 +62,7 @@ defmodule AtomicWeb.DepartmentLive.Index do
     |> Enum.map(fn department ->
       collaborators =
         department.id
-        |> Departments.list_collaborators_by_department_id(
+        |> Departments.list_department_collaborators(
           preloads: [:user],
           where: [accepted: true]
         )
diff --git a/lib/atomic_web/live/department_live/show.ex b/lib/atomic_web/live/department_live/show.ex
index faee63964..8a3281341 100644
--- a/lib/atomic_web/live/department_live/show.ex
+++ b/lib/atomic_web/live/department_live/show.ex
@@ -41,7 +41,7 @@ defmodule AtomicWeb.DepartmentLive.Show do
       |> assign(list_collaborators(department.id, params, has_permissions))
       |> assign(
         :all_collaborators,
-        Departments.list_collaborators_by_department_id(department.id,
+        Departments.list_department_collaborators(department.id,
           preloads: [:user],
           where: [accepted: true]
         )
@@ -76,7 +76,7 @@ defmodule AtomicWeb.DepartmentLive.Show do
     |> assign(list_collaborators(department.id, params, has_permissions))
     |> assign(
       :all_collaborators,
-      Departments.list_collaborators_by_department_id(department.id,
+      Departments.list_department_collaborators(department.id,
         preloads: [:user],
         where: [accepted: true]
       )
diff --git a/lib/atomic_web/live/department_live/show.html.heex b/lib/atomic_web/live/department_live/show.html.heex
index 92311720d..c0b799d7d 100644
--- a/lib/atomic_web/live/department_live/show.html.heex
+++ b/lib/atomic_web/live/department_live/show.html.heex
@@ -1,215 +1,185 @@
-<div class="min-h-[100vh] lg:border-r">
-  <!-- Department Header -->
-  <div class="h-32 w-full select-none">
-    <%= if @department.banner do %>
-      <img class="h-32 w-full object-cover" src={Uploaders.Banner.url({@department.banner, @department}, :original)} />
-    <% else %>
-      <.gradient seed={@department.id} class="object-cover" />
-    <% end %>
-  </div>
-  <div class="flex flex-col items-stretch justify-between lg:flex-row">
-    <div class="flex w-full flex-col bg-white lg:flex-row">
-      <main class="relative z-0 mb-10 flex-1 overflow-y-auto focus:outline-none xl:order-last">
-        <div class="mx-4 max-w-5xl sm:mx-6 lg:mx-8">
-          <div class="my-6 flex min-w-0 items-center justify-between sm:flex-row">
-            <!-- Department info -->
-            <div>
-              <h1 class="text-wrap flex-1 select-none truncate pr-4 text-xl font-bold text-zinc-900 sm:text-2xl">
-                {@department.name}
-              </h1>
-              <.link navigate={~p"/organizations/#{@organization}"}>
-                <h3>
-                  @{@organization.name}
-                </h3>
-              </.link>
-            </div>
-            <!-- Actions -->
-            <!-- Small screens -->
-            <div class="flex gap-2 sm:hidden">
-              <%= if @current_view == "show" do %>
-                <!-- Collaborate -->
-                <%= if !@current_collaborator do %>
-                  <%= if @department.collaborator_applications do %>
-                    <.button
-                      phx-click={
+<.page title={@page_title} description={"@#{@organization.name}"}>
+  <:header>
+    <div class="h-32 w-full select-none">
+      <%= if @department.banner do %>
+        <img class="h-32 w-full object-cover" src={Uploaders.Banner.url({@department.banner, @department}, :original)} />
+      <% else %>
+        <.gradient seed={@department.id} class="object-cover" />
+      <% end %>
+    </div>
+  </:header>
+
+  <:actions>
+    <!-- Actions -->
+    <!-- Small screens -->
+    <div class="flex gap-2 sm:hidden">
+      <%= if @current_view == "show" do %>
+        <!-- Collaborate -->
+        <%= if !@current_collaborator do %>
+          <%= if @department.collaborator_applications do %>
+            <.button
+              phx-click={
                           "#{if @is_authenticated? do
                             "collaborate"
                           else
                             "must-login"
                           end}"
                         }
-                      color={:white}
-                      icon="hero-user-plus-solid"
-                      title={gettext("Collaborate")}
-                    />
-                  <% end %>
-                <% else %>
-                  <%= if ! @current_collaborator.accepted do %>
-                    <.button color={:white} icon="hero-user-plus-solid" aria-label={gettext("You have requested to collaborate with this department. Please wait for the department owner to accept your request.")} disabled />
-                  <% end %>
-                <% end %>
-                <.dropdown
-                  id="actions"
-                  items={
-                    [
-                      %{
-                        name: gettext("Collaborators"),
-                        navigate: ~p"/organizations/#{@organization}/departments/#{@department}?tab=collaborators",
-                        icon: "hero-user-group"
-                      }
-                    ] ++
-                      if @has_permissions? || (@current_collaborator && @current_collaborator.accepted) do
-                        [%{name: gettext("Edit"), navigate: ~p"/organizations/#{@organization}/departments/#{@department}/edit?#{@params}", icon: "hero-pencil"}]
-                      else
-                        []
-                      end
-                  }
-                >
-                  <:wrapper>
-                    <.button color={:white} icon="hero-ellipsis-horizontal-solid" />
-                  </:wrapper>
-                </.dropdown>
-              <% end %>
-            </div>
-            <!-- Large screens -->
-            <div class="hidden flex-row gap-4 sm:flex">
-              <%= if @current_view == "show" do %>
-                <!-- Collaborate -->
-                <%= if !@current_collaborator do %>
-                  <%= if @department.collaborator_applications do %>
-                    <.button
-                      phx-click={
+              color={:white}
+              icon="hero-user-plus-solid"
+              title={gettext("Collaborate")}
+            />
+          <% end %>
+        <% else %>
+          <%= if ! @current_collaborator.accepted do %>
+            <.button color={:white} icon="hero-user-plus-solid" aria-label={gettext("You have requested to collaborate with this department. Please wait for the department owner to accept your request.")} disabled />
+          <% end %>
+        <% end %>
+        <.dropdown
+          id="actions"
+          items={
+            [
+              %{
+                name: gettext("Collaborators"),
+                navigate: ~p"/organizations/#{@organization}/departments/#{@department}?tab=collaborators",
+                icon: "hero-user-group"
+              }
+            ] ++
+              if @has_permissions? || (@current_collaborator && @current_collaborator.accepted) do
+                [%{name: gettext("Edit"), navigate: ~p"/organizations/#{@organization}/departments/#{@department}/edit?#{@params}", icon: "hero-pencil"}]
+              else
+                []
+              end
+          }
+        >
+          <:wrapper>
+            <.button color={:white} icon="hero-ellipsis-horizontal-solid" />
+          </:wrapper>
+        </.dropdown>
+      <% end %>
+    </div>
+    <!-- Large screens -->
+    <div class="hidden flex-row gap-4 sm:flex">
+      <%= if @current_view == "show" do %>
+        <!-- Collaborate -->
+        <%= if !@current_collaborator do %>
+          <%= if @department.collaborator_applications do %>
+            <.button
+              phx-click={
                           "#{if @is_authenticated? do
                             "collaborate"
                           else
                             "must-login"
                           end}"
                         }
-                      color={:white}
-                      icon="hero-user-plus-solid"
-                    >
-                      {gettext("Collaborate")}
-                    </.button>
-                  <% end %>
-                <% else %>
-                  <%= if ! @current_collaborator.accepted do %>
-                    <.button color={:white} icon="hero-user-plus-solid" aria-label={gettext("You have requested to collaborate with this department. Please wait for the department owner to accept your request.")} disabled>
-                      {gettext("Collaborate")}
-                    </.button>
-                  <% end %>
-                <% end %>
-                <%= if @has_permissions? || (@current_collaborator && @current_collaborator.accepted) do %>
-                  <!-- Collaborators view -->
-                  <.button icon="hero-user-group-solid" color={:white} patch={~p"/organizations/#{@organization}/departments/#{@department}?tab=collaborators"} />
-                <% end %>
-                <!-- Edit department -->
-                <%= if @has_permissions? do %>
-                  <.button icon="hero-pencil-solid" color={:white} patch={~p"/organizations/#{@organization}/departments/#{@department}/edit?#{@params}"} />
-                <% end %>
-              <% else %>
-                <!-- Exit collaborators view -->
-                <.button icon="hero-arrow-left-solid" color={:white} patch={~p"/organizations/#{@organization}/departments/#{@department}"} />
-              <% end %>
+              color={:white}
+              icon="hero-user-plus-solid"
+            >
+              <%= gettext("Collaborate") %>
+            </.button>
+          <% end %>
+        <% else %>
+          <%= if ! @current_collaborator.accepted do %>
+            <.button color={:white} icon="hero-user-plus-solid" aria-label={gettext("You have requested to collaborate with this department. Please wait for the department owner to accept your request.")} disabled>
+              <%= gettext("Collaborate") %>
+            </.button>
+          <% end %>
+        <% end %>
+        <%= if @has_permissions? || (@current_collaborator && @current_collaborator.accepted) do %>
+          <!-- Collaborators view -->
+          <.button icon="hero-user-group-solid" color={:white} patch={~p"/organizations/#{@organization}/departments/#{@department}?tab=collaborators"} />
+        <% end %>
+        <!-- Edit department -->
+        <%= if @has_permissions? do %>
+          <.button icon="hero-pencil-solid" color={:white} patch={~p"/organizations/#{@organization}/departments/#{@department}/edit?#{@params}"} />
+        <% end %>
+      <% else %>
+        <!-- Exit collaborators view -->
+        <.button icon="hero-arrow-left-solid" color={:white} patch={~p"/organizations/#{@organization}/departments/#{@department}"} />
+      <% end %>
+    </div>
+  </:actions>
+
+  <%= if @current_view == "show" do %>
+    <div class="mx-4 mt-8 grid grid-cols-3 grid-rows-1 sm:mx-6 lg:mx-8">
+      <div class="col-span-3 sm:col-span-2">
+        <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900"><%= gettext("Recent Activity") %></h2>
+        <!-- Recent activity empty state -->
+        <.link class="mt-4 flex flex-col items-center justify-center" navigate={~p"/organizations/#{@organization.id}"}>
+          <.avatar class="mb-4 p-1" type={:organization} color={:white} size={:lg} name={@organization.name} src={Uploaders.Logo.url({@organization.logo, @organization}, :original)} />
+          <p class="select-none text-center text-zinc-900"><%= gettext("This department doesn't have any recent activity.") %></p>
+          <p class="select-none text-center text-zinc-900"><%= gettext("In the meantime, check out %{organization_name}.", organization_name: @organization.name) %></p>
+        </.link>
+      </div>
+      <!-- People -->
+      <div class="hidden w-full sm:block">
+        <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900"><%= gettext("People") %></h2>
+        <div class="mb-2 flex max-w-full flex-wrap gap-1">
+          <%= for collaborator <- @all_collaborators |> Enum.take(18) do %>
+            <div class="h-12">
+              <.avatar name={collaborator.user.name} size={:sm} color={:light_zinc} />
             </div>
-          </div>
+          <% end %>
+          <!-- People empty state -->
+          <%= if length(@all_collaborators) == 0 do %>
+            <.icon class="mx-32 text-zinc-900" name="hero-users" />
+            <p class="mb-4 select-none text-center text-zinc-900"><%= gettext("This department doesn't have any collaborators yet!") %></p>
+          <% end %>
         </div>
-        <%= if @current_view == "show" do %>
-          <!-- Description -->
-          <div class="mx-4 sm:mx-6 lg:mx-8">
-            {@department.description}
-          </div>
-          <div class="mx-4 mt-8 grid grid-cols-3 grid-rows-1 sm:mx-6 lg:mx-8">
-            <div class="col-span-3 sm:col-span-2">
-              <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900">{gettext("Recent Activity")}</h2>
-              <!-- Recent activity empty state -->
-              <.link class="mt-4 flex flex-col items-center justify-center" navigate={~p"/organizations/#{@organization}"}>
-                <.avatar class="mb-4 p-1" type={:organization} color={:white} size={:lg} name={@organization.name} src={Uploaders.Logo.url({@organization.logo, @organization}, :original)} />
-                <p class="select-none text-center text-zinc-900">{gettext("This department doesn't have any recent activity.")}</p>
-                <p class="select-none text-center text-zinc-900">{gettext("In the meantime, check out %{organization_name}.", organization_name: @organization.name)}</p>
-              </.link>
-            </div>
-            <!-- People -->
-            <div class="hidden w-full sm:block">
-              <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900">{gettext("People")}</h2>
-              <div class="mb-2 flex max-w-full gap-1">
-                <!-- People listing -->
-                <.avatar_group
-                  size={:sm}
-                  color={:light_zinc}
-                  spacing={0}
-                  wrap
-                  class="gap-1"
-                  items={
-                    @all_collaborators
-                    |> Enum.take(18)
-                    |> Enum.map(fn collaborator ->
-                      %{
-                        name: collaborator.user.name
-                      }
-                    end)
-                  }
-                />
-                <!-- People empty state -->
-                <%= if length(@all_collaborators) == 0 do %>
-                  <.icon class="mx-32 text-zinc-900" name="hero-users" />
-                  <p class="mb-4 select-none text-center text-zinc-900">{gettext("This department doesn't have any collaborators yet!")}</p>
+        <.link :if={length(@all_collaborators) != 0} patch={~p"/organizations/#{@organization}/departments/#{@department}?tab=collaborators"} class="text-orange-500 hover:cursor-pointer hover:underline">
+          <%= gettext("View all collaborators") %>
+        </.link>
+      </div>
+    </div>
+  <% end %>
+
+  <%= if @current_view == "collaborators" do %>
+    <%= if length(@collaborators) != 0 do %>
+      <%= if @has_permissions? do %>
+        <!-- Collaborators admin view -->
+        <div class="mx-auto px-4 sm:px-6 lg:px-8">
+          <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900">Collaborators</h2>
+          <div class="border-t border-l">
+            <.table items={@collaborators} meta={@meta} filter={[]}>
+              <:col :let={collaborator} label="Name" field={:string}><%= collaborator.user.name %></:col>
+              <:col :let={collaborator} label="Email" field={:string}><%= collaborator.user.email %></:col>
+              <:col :let={collaborator} label="Phone number" field={:string}><%= collaborator.user.phone_number %></:col>
+              <:col :let={collaborator} label="Accepted" field={:string}>
+                <input type="checkbox" disabled={true} checked={collaborator.accepted} class="mx-auto block rounded-md text-zinc-600" />
+              </:col>
+              <:col :let={collaborator}>
+                <%= if collaborator.accepted do %>
+                  <.button icon="hero-pencil-solid" color={:white} full_width patch={~p"/organizations/#{@organization}/departments/#{@department}/collaborators/#{collaborator.id}/edit?#{@params}"}>Edit</.button>
+                <% else %>
+                  <.button icon="hero-envelope-solid" color={:white} full_width patch={~p"/organizations/#{@organization}/departments/#{@department}/collaborators/#{collaborator.id}/edit?#{@params}"}>Review</.button>
                 <% end %>
-              </div>
-              <.link :if={length(@all_collaborators) != 0} patch={~p"/organizations/#{@organization}/departments/#{@department}?tab=collaborators"} class="text-primary-500 hover:cursor-pointer hover:underline">
-                {gettext("View all collaborators")}
-              </.link>
-            </div>
+              </:col>
+            </.table>
           </div>
-        <% end %>
-        <%= if @current_view == "collaborators" do %>
-          <%= if length(@collaborators) != 0 do %>
-            <%= if @has_permissions? do %>
-              <!-- Collaborators admin view -->
-              <div class="mx-auto px-4 sm:px-6 lg:px-8">
-                <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900">Collaborators</h2>
-                <div class="border-t border-l">
-                  <.table items={@collaborators} meta={@meta} filter={[]}>
-                    <:col :let={collaborator} label="Name" field={:string}>{collaborator.user.name}</:col>
-                    <:col :let={collaborator} label="Email" field={:string}>{collaborator.user.email}</:col>
-                    <:col :let={collaborator} label="Phone number" field={:string}>{collaborator.user.phone_number}</:col>
-                    <:col :let={collaborator} label="Accepted" field={:string}>
-                      <input type="checkbox" disabled={true} checked={collaborator.accepted} class="mx-auto block rounded-md text-zinc-600" />
-                    </:col>
-                    <:col :let={collaborator}>
-                      <%= if collaborator.accepted do %>
-                        <.button icon="hero-pencil-solid" color={:white} full_width patch={~p"/organizations/#{@organization}/departments/#{@department}/collaborators/#{collaborator.id}/edit?#{@params}"} />
-                      <% else %>
-                        <.button icon="hero-envelope-solid" color={:white} full_width patch={~p"/organizations/#{@organization}/departments/#{@department}/collaborators/#{collaborator.id}/edit?#{@params}"}>Review</.button>
-                      <% end %>
-                    </:col>
-                  </.table>
+          <.pagination items={@collaborators} meta={@meta} params={@params} class="flex w-full items-center justify-between border border-t-0 pt-2" />
+        </div>
+      <% else %>
+        <!-- Collaborators user view -->
+        <div class="mx-4 sm:mx-6 lg:mx-8">
+          <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900">Collaborators</h2>
+          <%= for collaborator <- @collaborators do %>
+            <div class="border border-zinc-200 p-3 hover:bg-zinc-50">
+              <div class="flex">
+                <.avatar name={collaborator.user.name} />
+                <div class="ml-3 flex h-full flex-col self-center">
+                  <p><%= collaborator.user.name %></p>
+                  <p>@<%= collaborator.user.slug %></p>
                 </div>
-                <.pagination items={@collaborators} meta={@meta} params={@params} class="flex w-full items-center justify-between border border-t-0 pt-2" />
               </div>
-            <% else %>
-              <!-- Collaborators user view -->
-              <div class="mx-4 sm:mx-6 lg:mx-8">
-                <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900">Collaborators</h2>
-                <%= for collaborator <- @collaborators do %>
-                  <div class="border border-zinc-200 p-3 hover:bg-zinc-50">
-                    <div class="flex">
-                      <.avatar name={collaborator.user.name} />
-                      <div class="ml-3 flex h-full flex-col self-center">
-                        <p>{collaborator.user.name}</p>
-                        <p>@{collaborator.user.slug}</p>
-                      </div>
-                    </div>
-                  </div>
-                <% end %>
-                <.pagination items={@collaborators} meta={@meta} params={@params} class="mt-2 flex w-full items-center justify-between" />
-              </div>
-            <% end %>
+            </div>
           <% end %>
-        <% end %>
-      </main>
-    </div>
-  </div>
-</div>
+          <.pagination items={@collaborators} meta={@meta} params={@params} class="mt-2 flex w-full items-center justify-between" />
+        </div>
+      <% end %>
+    <% end %>
+  <% end %>
+</.page>
+
 <.modal :if={@live_action in [:edit_collaborator]} id="edit-collaborator" show on_cancel={JS.patch(~p"/organizations/#{@organization}/departments/#{@department}?#{Map.delete(@params, "collaborator_id")}")}>
   <.live_component module={AtomicWeb.CollaboratorLive.FormComponent} id={@collaborator.id} title={@page_title} action={@live_action} collaborator={@collaborator} department={@department} />
 </.modal>
diff --git a/lib/atomic_web/live/home_live/index.ex b/lib/atomic_web/live/home_live/index.ex
index 142486207..4fb5fef98 100644
--- a/lib/atomic_web/live/home_live/index.ex
+++ b/lib/atomic_web/live/home_live/index.ex
@@ -86,8 +86,8 @@ defmodule AtomicWeb.HomeLive.Index do
     current_user = socket.assigns.current_user
 
     %{entries: entries, metadata: metadata} =
-      Organizations.list_memberships(%{"user_id" => current_user.id})
-      |> Enum.map(& &1.organization_id)
+      Organizations.list_user_organizations(current_user.id, [:follower])
+      |> Enum.map(& &1.id)
       |> Feed.list_posts_following_paginated([])
 
     {:noreply,
diff --git a/lib/atomic_web/live/organization_live/components/about.ex b/lib/atomic_web/live/organization_live/components/about.ex
new file mode 100644
index 000000000..5f036de7d
--- /dev/null
+++ b/lib/atomic_web/live/organization_live/components/about.ex
@@ -0,0 +1,64 @@
+defmodule AtomicWeb.OrganizationLive.Components.About do
+  @moduledoc false
+  use AtomicWeb, :component
+
+  alias Atomic.Organizations.Organization
+  alias Atomic.Socials
+
+  attr :organization, Organization, required: true, doc: "the organization which about to display"
+
+  def about(assigns) do
+    ~H"""
+    <div id="organization-about">
+      <h2 class="mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900"><%= gettext("Description") %></h2>
+      <p><%= @organization.description %></p>
+
+      <div :if={@organization.location}>
+        <h2 class="mt-8 mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900"><%= gettext("Location") %></h2>
+        <p class="text-zinc-900"><%= @organization.location %></p>
+      </div>
+
+      <div :if={@organization.socials}>
+        <h2 class="mt-8 mb-2 flex-1 select-none truncate text-lg font-semibold text-zinc-900"><%= gettext("Socials") %></h2>
+
+        <ul role="list" class="flex flex-col space-y-2 md:flex-row md:items-center md:space-x-6 md:space-y-0">
+          <li :if={@organization.socials.website}>
+            <.link href={@organization.socials.website} target="_blank" class="group flex items-center space-x-1">
+              <.icon name="hero-link"  class="size-4" />
+              <p class="group-hover:underline"><%= @organization.socials.website %></p>
+            </.link>
+          </li>
+
+          <li :if={@organization.socials.facebook}>
+            <.link href={Socials.link(:facebook, @organization.socials.facebook)} target="_blank" class="group flex items-center space-x-1">
+              <%= Socials.icon(:facebook) |> raw() %>
+              <p class="group-hover:underline"><%= @organization.socials.facebook %></p>
+            </.link>
+          </li>
+
+          <li :if={@organization.socials.instagram}>
+            <.link href={Socials.link(:instagram, @organization.socials.instagram)} target="_blank" class="group flex items-center space-x-1">
+              <%= Socials.icon(:instagram) |> raw() %>
+              <p class="group-hover:underline"><%= @organization.socials.instagram %></p>
+            </.link>
+          </li>
+
+          <li :if={@organization.socials.x}>
+            <.link href={Socials.link(:x, @organization.socials.x)} target="_blank" class="group flex items-center space-x-1">
+              <%= Socials.icon(:x) |> raw() %>
+              <p class="group-hover:underline"><%= @organization.socials.x %></p>
+            </.link>
+          </li>
+
+          <li :if={@organization.socials.linkedin}>
+            <.link href={Socials.link(:linkedin, @organization.socials.linkedin)} target="_blank" class="group flex items-center space-x-1">
+              <%= Socials.icon(:linkedin) |> raw() %>
+              <p class="group-hover:underline"><%= @organization.socials.linkedin %></p>
+            </.link>
+          </li>
+        </ul>
+      </div>
+    </div>
+    """
+  end
+end
diff --git a/lib/atomic_web/live/organization_live/components/departments_grid.ex b/lib/atomic_web/live/organization_live/components/departments_grid.ex
new file mode 100644
index 000000000..569ac1e2b
--- /dev/null
+++ b/lib/atomic_web/live/organization_live/components/departments_grid.ex
@@ -0,0 +1,42 @@
+defmodule AtomicWeb.OrganizationLive.Components.DepartmentsGrid do
+  @moduledoc """
+  Internal organization-related component for displaying its departments.
+  """
+  use AtomicWeb, :component
+
+  alias Atomic.Departments
+  alias Atomic.Organizations.{Department, Organization}
+
+  # FIXME: This should be a shared component
+  import AtomicWeb.DepartmentLive.Components.DepartmentCard
+
+  attr :organization, Organization,
+    required: true,
+    doc: "the organization which departments to display"
+
+  def departments_grid(assigns) do
+    ~H"""
+    <div id="organization-departments" class="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-2">
+      <%= for department <- list_departments(@organization) do %>
+        <.link navigate={~p"/organizations/#{@organization.id}/departments/#{department.id}"}>
+          <.department_card department={department} collaborators={list_department_collaborators(department)} />
+        </.link>
+      <% end %>
+    </div>
+    """
+  end
+
+  defp list_departments(%Organization{} = organization) do
+    Departments.list_departments_by_organization_id(organization.id,
+      preloads: [:organization],
+      where: [archived: false]
+    )
+  end
+
+  defp list_department_collaborators(%Department{} = department) do
+    Departments.list_department_collaborators(department.id,
+      preloads: [:user],
+      where: [accepted: true]
+    )
+  end
+end
diff --git a/lib/atomic_web/live/organization_live/components/membership_banner.ex b/lib/atomic_web/live/organization_live/components/membership_banner.ex
new file mode 100644
index 000000000..d789add3b
--- /dev/null
+++ b/lib/atomic_web/live/organization_live/components/membership_banner.ex
@@ -0,0 +1,55 @@
+defmodule AtomicWeb.OrganizationLive.Components.MembershipBanner do
+  @moduledoc """
+  Organization membership banner component. Displays information about the organization's membership benefits and price.
+  """
+  use AtomicWeb, :component
+
+  alias Atomic.Organizations.Organization
+
+  attr :organization, Organization,
+    required: true,
+    doc: "the organization which membership banner to display"
+
+  def membership_banner(assigns) do
+    ~H"""
+    <div class="mx-auto rounded-3xl ring-1 ring-gray-200 lg:mx-0 lg:flex lg:max-w-none">
+      <div class="p-8 sm:p-10">
+        <h3 class="text-2xl font-bold tracking-tight text-gray-900"><%= gettext("Lifetime membership") %></h3>
+        <div class="mt-10 flex items-center gap-x-4">
+          <h4 class="flex-none text-sm font-semibold leading-6 text-orange-600"><%= gettext("What’s included") %></h4>
+          <div class="h-px flex-auto bg-gray-100"></div>
+        </div>
+
+        <ul role="list" class="mt-8 grid grid-cols-1 gap-4 text-sm leading-6 text-gray-600 sm:grid-cols-2 sm:gap-6">
+          <li class="flex gap-x-3">
+            <.icon name="hero-check" class="h-6 w-5 flex-none text-orange-600" />
+            <p>Access to our room facilities</p>
+          </li>
+          <li class="flex gap-x-3">
+            <.icon name="hero-check" class="h-6 w-5 flex-none text-orange-600" />
+            <p>Free access to all activities</p>
+          </li>
+          <li class="flex gap-x-3">
+            <.icon name="hero-check" class="h-6 w-5 flex-none text-orange-600" />
+            <p>Official member t-shirt</p>
+          </li>
+        </ul>
+      </div>
+
+      <div class="-mt-2 p-2 lg:mt-0 lg:w-full lg:max-w-md lg:flex-shrink-0">
+        <div class="ring-gray-900/5 rounded-2xl bg-gray-50 py-10 text-center ring-1 ring-inset lg:flex lg:flex-col lg:justify-center lg:py-16">
+          <div class="mx-auto flex max-w-xs flex-col items-center px-8">
+            <p class="text-base font-semibold text-gray-600"><%= gettext("Pay once, be a member forever") %></p>
+            <p class="mt-6 flex items-baseline justify-center gap-x-2">
+              <span class="text-5xl font-bold tracking-tight text-gray-900">10€</span>
+              <span class="text-sm font-semibold leading-6 tracking-wide text-gray-600">EUR</span>
+            </p>
+            <.button icon="hero-banknotes" class="mt-10 text-sm"><%= gettext("Request your membership") %></.button>
+            <p class="mt-6 text-xs leading-5 text-gray-600"><%= gettext("Payments should be made within our location.") %> <%= @organization.location %></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    """
+  end
+end
diff --git a/lib/atomic_web/live/organization_live/components/memberships_table.ex b/lib/atomic_web/live/organization_live/components/memberships_table.ex
new file mode 100644
index 000000000..ee794170f
--- /dev/null
+++ b/lib/atomic_web/live/organization_live/components/memberships_table.ex
@@ -0,0 +1,52 @@
+defmodule AtomicWeb.OrganizationLive.Components.MembershipsTable do
+  @moduledoc """
+  Internal organization-related component for displaying its memberships in the form of a table.
+  """
+  use AtomicWeb, :component
+
+  import AtomicWeb.Components.Avatar
+
+  attr :members, :list, required: true, doc: "the list of memberships to display"
+
+  # TODO: Make use of table component?
+  def memberships_table(assigns) do
+    ~H"""
+    <div class="mt-8 flow-root">
+      <div class="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
+        <div class="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8">
+          <table class="min-w-full divide-y divide-gray-300">
+            <thead>
+              <tr>
+                <th scope="col" class="py-3 pr-3 pl-4 text-left text-xs font-medium uppercase tracking-wide text-gray-500 sm:pl-0"><%= gettext("Name") %></th>
+                <th scope="col" class="px-3 py-3 text-left text-xs font-medium uppercase tracking-wide text-gray-500"><%= gettext("Role") %></th>
+                <th scope="col" class="px-3 py-3 text-left text-xs font-medium uppercase tracking-wide text-gray-500"><%= gettext("Joined At") %></th>
+              </tr>
+            </thead>
+
+            <tbody class="divide-y divide-gray-200 bg-white">
+              <tr :for={member <- @members} class="hover:cursor-pointer hover:bg-gray-50" phx-click={row_click(member)}>
+                <td class="whitespace-nowrap py-5 pr-3 pl-4 text-sm sm:pl-0">
+                  <div class="flex items-center">
+                    <.avatar name={member.user.name} size={:sm} color={:light_zinc} class="ring-1 ring-white" />
+                    <div class="ml-4">
+                      <div class="font-medium text-gray-900"><%= member.user.name %></div>
+                      <div class="mt-1 text-gray-500"><%= member.user.email %></div>
+                    </div>
+                  </div>
+                </td>
+                <td class="whitespace-nowrap px-3 py-5 text-sm text-gray-900"><%= capitalize_first_letter(member.role) %></td>
+                <td class="whitespace-nowrap px-3 py-5 text-sm text-gray-500"><%= relative_datetime(member.inserted_at) %></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+    """
+  end
+
+  defp row_click(member) do
+    ~p"/profile/#{member.user.id}"
+    |> JS.navigate()
+  end
+end
diff --git a/lib/atomic_web/live/organization_live/components/organization_card.ex b/lib/atomic_web/live/organization_live/components/organization_card.ex
new file mode 100644
index 000000000..7799a6a24
--- /dev/null
+++ b/lib/atomic_web/live/organization_live/components/organization_card.ex
@@ -0,0 +1,89 @@
+defmodule AtomicWeb.OrganizationLive.Components.OrganizationCard do
+  @moduledoc false
+  use AtomicWeb, :component
+
+  alias Atomic.Accounts.User
+  alias Atomic.Organizations
+  alias Atomic.Organizations.Organization
+  alias Atomic.Uploaders
+
+  import AtomicWeb.Components.{Avatar, Button, Gradient}
+
+  attr :organization, Organization, required: true, doc: "The organization to display"
+  attr :current_user, User, required: false, default: nil, doc: "The current user, if any"
+
+  def organization_card(assigns) do
+    ~H"""
+    <div class="flex flex-col justify-center rounded-lg border border-zinc-200 hover:bg-zinc-50">
+      <div class="h-32 w-full select-none">
+        <!-- FIXME: Add banner support -->
+        <%!-- <%= if @organization.banner do %>
+          <img class="h-32 w-full object-cover" src={Uploaders.Banner.url({@organization.banner, @organization}, :original)} />
+        <% else %> --%>
+        <.gradient seed={@organization.id} class="rounded-t-lg" />
+        <%!-- <% end %> --%>
+      </div>
+
+      <div class="p-4">
+        <div class="relative flex w-full">
+          <div class="flex flex-1">
+            <div class="-mt-[6rem]">
+              <div class={[
+                "relative rounded-lg",
+                @organization.logo && "bg-white"
+              ]}>
+                <.avatar name={@organization.name} color={:white} size={:lg} class="!size-32 p-1" type={:organization} src={Uploaders.Logo.url({@organization.logo, @organization}, :original)} />
+              </div>
+            </div>
+            <p class="ml-3 text-lg font-semibold text-zinc-900">
+              <%= @organization.name %>
+            </p>
+          </div>
+
+          <%!-- TODO: Maybe show button when there's no current user, but with a must login warning? --%>
+          <%= if @current_user do %>
+            <%= if Organizations.user_following?(@current_user.id, @organization.id) do %>
+              <.button icon="hero-star-solid"><%= gettext("Following") %></.button>
+            <% else %>
+              <.button icon="hero-star"><%= gettext("Follow") %></.button>
+            <% end %>
+          <% end %>
+        </div>
+
+        <p class="mt-2 text-sm text-zinc-400">
+          <%= @organization.long_name %>
+        </p>
+
+        <div role="list" class="mt-2 flex flex-col space-y-2 md:flex-row md:items-center md:space-x-6 md:space-y-0">
+          <ul class="flex flex-col space-y-2 md:flex-row md:items-center md:space-x-6 md:space-y-0">
+            <li class="flex items-center space-x-1">
+              <.icon name="hero-users" class="size-4" />
+              <%= if @organization.follower_count != 1 do %>
+                <p class="text-sm">
+                  <span class="font-semibold"><%= @organization.follower_count %></span> followers
+                </p>
+              <% else %>
+                <p class="text-sm">
+                  <span class="font-semibold">1</span> follower
+                </p>
+              <% end %>
+            </li>
+
+            <li :if={@organization.location} class="flex items-center space-x-1">
+              <.icon name="hero-map-pin" class="size-4" />
+              <p class="text-sm"><%= @organization.location %></p>
+            </li>
+          </ul>
+
+          <div :if={@organization.socials && @organization.socials.website} class="group">
+            <.link href={@organization.socials.website} target="_blank" class="flex items-center space-x-1">
+              <.icon name="hero-link" class="size-4" />
+              <p class="text-sm group-hover:underline"><%= @organization.socials.website %></p>
+            </.link>
+          </div>
+        </div>
+      </div>
+    </div>
+    """
+  end
+end
diff --git a/lib/atomic_web/live/organization_live/form_component.ex b/lib/atomic_web/live/organization_live/form_component.ex
deleted file mode 100644
index 50b492388..000000000
--- a/lib/atomic_web/live/organization_live/form_component.ex
+++ /dev/null
@@ -1,60 +0,0 @@
-defmodule AtomicWeb.OrganizationLive.FormComponent do
-  use AtomicWeb, :live_component
-
-  alias Atomic.Organizations
-
-  @impl true
-  def mount(socket) do
-    {:ok, socket}
-  end
-
-  @impl true
-  def update(%{organization: organization} = assigns, socket) do
-    changeset = Organizations.change_organization(organization)
-
-    {:ok,
-     socket
-     |> assign(assigns)
-     |> assign(:changeset, changeset)}
-  end
-
-  @impl true
-  def handle_event("validate", %{"organization" => organization_params}, socket) do
-    changeset =
-      socket.assigns.organization
-      |> Organizations.change_organization(organization_params)
-      |> Map.put(:action, :validate)
-
-    {:noreply, assign(socket, :changeset, changeset)}
-  end
-
-  def handle_event("save", %{"organization" => organization_params}, socket) do
-    save_organization(socket, socket.assigns.action, organization_params)
-  end
-
-  defp save_organization(socket, :edit, organization_params) do
-    case Organizations.update_organization(socket.assigns.organization, organization_params) do
-      {:ok, _organization} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, "Organization updated successfully")
-         |> push_navigate(to: socket.assigns.return_to)}
-
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, :changeset, changeset)}
-    end
-  end
-
-  defp save_organization(socket, :new, organization_params) do
-    case Organizations.create_organization(organization_params) do
-      {:ok, _organization} ->
-        {:noreply,
-         socket
-         |> put_flash(:info, "Organization created successfully")
-         |> push_navigate(to: socket.assigns.return_to)}
-
-      {:error, %Ecto.Changeset{} = changeset} ->
-        {:noreply, assign(socket, changeset: changeset)}
-    end
-  end
-end
diff --git a/lib/atomic_web/live/organization_live/index.ex b/lib/atomic_web/live/organization_live/index.ex
index 6a7471bca..a9452c787 100644
--- a/lib/atomic_web/live/organization_live/index.ex
+++ b/lib/atomic_web/live/organization_live/index.ex
@@ -1,23 +1,25 @@
 defmodule AtomicWeb.OrganizationLive.Index do
   use AtomicWeb, :live_view
 
-  import AtomicWeb.Components.Avatar
-  import AtomicWeb.Components.Empty
-  import AtomicWeb.Components.Pagination
-  import AtomicWeb.Components.Button
-  import AtomicWeb.LiveHelpers
+  alias Atomic.{Accounts, Organizations}
 
-  alias Atomic.Accounts
-  alias Atomic.Organizations
+  import AtomicWeb.Components.{Dropdown, Pagination, Empty, Forms}
+  import AtomicWeb.OrganizationLive.Components.OrganizationCard
+  import AtomicWeb.LiveHelpers
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket}
+    form = to_form(%{}, as: "search")
+
+    {:ok,
+     socket
+     |> assign(:form, form)
+     |> assign(:query, "")}
   end
 
   @impl true
-  def handle_params(params, _url, socket) do
-    organizations_with_flop = list_organizations(params)
+  def handle_params(params, _, socket) do
+    %{organizations: organizations, meta: meta} = list_organizations(params, socket.assigns.query)
 
     {:noreply,
      socket
@@ -25,13 +27,46 @@ defmodule AtomicWeb.OrganizationLive.Index do
      |> assign_page_metadata(:organizations)
      |> assign(:current_page, :organizations)
      |> assign(:params, params)
-     |> assign(organizations_with_flop)
-     |> assign(:empty?, Enum.empty?(organizations_with_flop.organizations))
+     |> stream(:organizations, organizations)
+     |> assign(:meta, meta)
+     |> assign(:empty?, Enum.empty?(organizations))
      |> assign(:has_permissions?, has_permissions?(socket))}
   end
 
-  defp list_organizations(params) do
-    case Organizations.list_organizations(Map.put(params, "page_size", 18)) do
+  @impl true
+  def handle_event("search", %{"search" => query}, socket) do
+    %{organizations: organizations, meta: meta} = list_organizations(socket.assigns.params, query)
+
+    {:noreply,
+     socket
+     |> assign(:query, query)
+     |> stream(:organizations, organizations, reset: true)
+     |> assign(:meta, meta)}
+  end
+
+  @impl true
+  def handle_event("sort", %{"field" => field}, socket) do
+    %{organizations: organizations, meta: meta} =
+      list_organizations(socket.assigns.params, socket.assigns.query, field)
+
+    {:noreply,
+     socket
+     |> stream(:organizations, organizations, reset: true)
+     |> assign(:meta, meta)}
+  end
+
+  defp list_organizations(params, query, order \\ nil) do
+    params = Map.put(params, "page_size", 6)
+
+    params =
+      Map.put(params, "filters", %{
+        filters: %{field: :name, op: :ilike, value: query}
+      })
+
+    params = if order, do: Map.put(params, "order_by", [order]), else: params
+    params = if order, do: Map.put(params, "order_directions", [:desc]), else: params
+
+    case Organizations.list_organizations(params) do
       {:ok, {organizations, meta}} ->
         %{organizations: organizations, meta: meta}
 
@@ -42,7 +77,6 @@ defmodule AtomicWeb.OrganizationLive.Index do
 
   defp has_permissions?(socket) when not socket.assigns.is_authenticated?, do: false
 
-  defp has_permissions?(socket) do
-    Accounts.has_master_permissions?(socket.assigns.current_user.id)
-  end
+  defp has_permissions?(socket),
+    do: Accounts.has_master_permissions?(socket.assigns.current_user.id)
 end
diff --git a/lib/atomic_web/live/organization_live/index.html.heex b/lib/atomic_web/live/organization_live/index.html.heex
index 47cfca2d1..3556b59b0 100644
--- a/lib/atomic_web/live/organization_live/index.html.heex
+++ b/lib/atomic_web/live/organization_live/index.html.heex
@@ -1,10 +1,27 @@
-<.page title="Organizations">
+<.page title={@page_title}>
   <:actions>
     <%= if not @empty? and @has_permissions? do %>
-      <.button navigate={~p"/organizations/new"}>
-        {gettext("New")}
+      <.button navigate={~p"/organizations/new"} icon="hero-plus">
+        <%= gettext("New") %>
       </.button>
     <% end %>
+
+    <.dropdown
+      id="sort-organizations-menu"
+      orientation={:down}
+      items={[
+        %{name: gettext("Name") <> " (A-Z)", phx_click: "sort", value: %{"field" => "name"}},
+        %{name: gettext("Followers"), phx_click: "sort", value: %{"field" => "follower_count"}}
+      ]}
+    >
+      <:wrapper>
+        <button type="button" class="inline-flex items-center w-full justify-center gap-x-1.5 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50" id="sort-menu-button" aria-expanded="false" aria-haspopup="true">
+          <.icon name="hero-bars-arrow-up" class="size-5 -ml-0.5 text-gray-500" />
+          <%= gettext("Sort") %>
+          <.icon name="hero-chevron-down" class="size-4 -mr-0.5 text-gray-500" />
+        </button>
+      </:wrapper>
+    </.dropdown>
   </:actions>
   <!-- Organization index -->
   <%= if @empty? and @has_permissions? do %>
@@ -12,26 +29,20 @@
       <.empty_state url={~p"/organizations/new"} placeholder="organization" />
     </div>
   <% else %>
-    <div class="mx-auto grid max-w-5xl grid-cols-1 gap-4 px-4 sm:grid-cols-2 sm:px-6 md:grid-cols-3 lg:px-8">
-      <%= for organization <- @organizations do %>
-        <.link navigate={~p"/organizations/#{organization.id}"}>
-          <div class="flex items-center space-x-4 rounded-lg border border-zinc-200 px-4 py-4 hover:cursor-pointer hover:bg-zinc-50">
-            <.avatar name={organization.name} src={Uploaders.Logo.url({organization.logo, organization}, :original)} type={:organization} size={:lg} color={:light_zinc} />
-            <div class="ml-4">
-              <h4 class="text-lg font-medium text-zinc-900">
-                {organization.name}
-              </h4>
-              <p class="hidden text-xs text-zinc-900 md:block xl:hidden">
-                {maybe_slice_string(organization.long_name, 35)}
-              </p>
-              <p class="text-xs text-zinc-900 sm:block md:hidden xl:block">
-                {maybe_slice_string(organization.long_name, 85)}
-              </p>
-            </div>
-          </div>
-        </.link>
-      <% end %>
+    <div class="mx-auto flex max-w-5xl flex-col px-4 sm:px-6 lg:px-8">
+      <.form id="search-form" for={@form} phx-change="search">
+        <.field phx-mounted={JS.focus()} value={@query} type="search" name="search" placeholder={"#{gettext("Search for an organization")}..."} />
+      </.form>
+
+      <ul role="list" class="space-y-6">
+        <li :for={{id, organization} <- @streams.organizations} id={id}>
+          <.link navigate={"/organizations/#{organization.id}"}>
+            <.organization_card organization={organization} current_user={@current_user} />
+          </.link>
+        </li>
+      </ul>
     </div>
-    <.pagination items={@organizations} meta={@meta} params={@params} class="mt-2 flex w-full items-center justify-between" />
+
+    <.pagination items={@streams.organizations} meta={@meta} params={@params} class="mt-2 flex w-full items-center justify-between" />
   <% end %>
 </.page>
diff --git a/lib/atomic_web/live/organization_live/show.ex b/lib/atomic_web/live/organization_live/show.ex
index 6eb06abae..1a46d5404 100644
--- a/lib/atomic_web/live/organization_live/show.ex
+++ b/lib/atomic_web/live/organization_live/show.ex
@@ -1,14 +1,16 @@
 defmodule AtomicWeb.OrganizationLive.Show do
   use AtomicWeb, :live_view
 
-  import AtomicWeb.Components.Avatar
-  import AtomicWeb.LiveHelpers
+  alias Atomic.{Accounts, Organizations, Departments, Activities}
 
-  alias Atomic.Accounts
-  alias Atomic.Activities
-  alias Atomic.Departments
-  alias Atomic.Organizations
-  alias Atomic.Uploaders.Logo
+  import AtomicWeb.Components.{Gradient, Tabs}
+
+  import AtomicWeb.OrganizationLive.Components.{
+    About,
+    DepartmentsGrid,
+    MembershipsTable,
+    MembershipBanner
+  }
 
   @impl true
   def mount(_params, _session, socket) do
@@ -16,14 +18,19 @@ defmodule AtomicWeb.OrganizationLive.Show do
   end
 
   @impl true
-  def handle_params(%{"organization_id" => organization_id} = _params, _, socket) do
+  def handle_params(%{"id" => organization_id} = params, _, socket) do
     organization = Organizations.get_organization!(organization_id)
+    members = maybe_list_members(organization.id, params["tab"])
+    member_count = Organizations.count_memberships(organization.id)
 
     {:noreply,
      socket
      |> assign(:page_title, organization.name)
-     |> assign_page_metadata(:organization)
+     |> assign(:current_page, :organization)
+     |> assign(:current_tab, current_tab(socket, params))
      |> assign(:organization, organization)
+     |> assign(:members, members)
+     |> assign(:member_count, member_count)
      |> assign(:people, Organizations.list_organizations_members(organization))
      |> assign(:current_page, :organizations)
      |> assign(:organization, organization)
@@ -77,6 +84,7 @@ defmodule AtomicWeb.OrganizationLive.Show do
     end
   end
 
+  # FIXME: Notification, somehow, is not appearing
   @impl true
   def handle_event("must-login", _payload, socket) do
     {:noreply,
@@ -95,13 +103,18 @@ defmodule AtomicWeb.OrganizationLive.Show do
     end
   end
 
-  defp maybe_put_following(socket, _organization) when not socket.assigns.is_authenticated?,
-    do: false
-
   defp maybe_put_following(socket, organization) do
     Organizations.member_of?(socket.assigns.current_user, organization)
   end
 
+  defp maybe_list_members(organization_id, "members"),
+    do: Organizations.list_memberships(organization_id, preloads: [:user])
+
+  defp maybe_list_members(_organization, _tab), do: nil
+
+  defp current_tab(_socket, params) when is_map_key(params, "tab"), do: params["tab"]
+  defp current_tab(_socket, _params), do: "about"
+
   defp has_permissions?(socket, _organization_id) when not socket.assigns.is_authenticated?,
     do: false
 
diff --git a/lib/atomic_web/live/organization_live/show.html.heex b/lib/atomic_web/live/organization_live/show.html.heex
index 4da34766a..1cd0c6929 100644
--- a/lib/atomic_web/live/organization_live/show.html.heex
+++ b/lib/atomic_web/live/organization_live/show.html.heex
@@ -1,110 +1,90 @@
-<div x-data="{ option: 'activities' }" class="py-5">
-  <div class="border-b border-zinc-200">
-    <div class="bg-white">
-      <div class="flex justify-between py-4">
-        <div class="w-full gap-x-4 lg:flex lg:flex-col">
-          <div class="flex flex-col items-center space-x-2 lg:flex-row lg:space-x-8">
-            <.avatar name={@organization.name} type={:organization} src={Logo.url({@organization.logo, @organization}, :original)} size={:xl} color={:light_zinc} />
-            <div class="flex-1 space-x-2">
-              <div class="flex flex-col items-center justify-center lg:flex-row lg:items-start lg:justify-start lg:space-x-2">
-                <div x-data="{ open: false }" class="flex flex-col items-center justify-center space-y-2 lg:items-start lg:justify-start">
-                  <h2 class="text-2xl font-medium text-zinc-900">
-                    {@organization.name}
-                  </h2>
-                  <p class="text-xs text-zinc-900">
-                    {@organization.long_name}
-                  </p>
-                  <div class="flex flex-row items-center space-x-2 text-sm">
-                    <span class="inline-flex items-center font-bold text-zinc-900">{@followers_count}</span>
-                    <span class="inline-flex w-full items-center text-zinc-900">Followers</span>
-                  </div>
-                  <div class="flex space-x-2">
-                    <%= if not @following? do %>
-                      <button phx-click="follow" type="button" class="bg-primary-500 w-32 rounded-md px-3.5 py-2.5 text-center text-sm font-medium text-white shadow-sm hover:bg-primary-600 focus-visible:outline-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2">
-                        Follow
-                      </button>
-                    <% else %>
-                      <%= if @organization.name == "CeSIUM" do %>
-                        <div class="bg-primary-400 inline w-32 rounded-md py-2 text-center text-sm font-medium text-white shadow-sm lg:my-0">Following</div>
-                      <% else %>
-                        <div class="relative">
-                          <div class="inline-flex rounded-md shadow-sm">
-                            <div class="inline-flex rounded-md shadow-sm">
-                              <div class="bg-primary-400 inline-flex items-center gap-x-1.5 rounded-l-md px-3 py-2.5 text-white shadow-sm">
-                                <p class="text-sm font-medium">Following</p>
-                              </div>
-                              <button
-                                type="button"
-                                @click="open = true"
-                                class="bg-primary-400 inline-flex items-center rounded-r-md rounded-l-none px-2 py-2.5 hover:bg-primary-600 focus-visible:ring-primary-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-zinc-50"
-                                aria-haspopup="listbox"
-                                aria-expanded="true"
-                                aria-labelledby="listbox-label"
-                              >
-                                <span class="sr-only">Change published status</span>
-                                <svg class="size-5 text-white" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                                  <path fill-rule="evenodd" d="M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z" clip-rule="evenodd" />
-                                </svg>
-                              </button>
-                            </div>
-                          </div>
-                          <ul
-                            x-show="open"
-                            phx-click="unfollow"
-                            @click.away="open = false"
-                            @click="open = false"
-                            class="absolute left-0 z-10 mt-2 -mr-1 w-72 origin-top-left divide-y divide-zinc-200 overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:left-auto"
-                            tabindex="-1"
-                            role="listbox"
-                            aria-labelledby="listbox-label"
-                            aria-activedescendant="listbox-option-0"
-                          >
-                            <li class="cursor-default select-none p-4 text-sm text-zinc-900 hover:cursor-pointer hover:bg-zinc-50">
-                              <div class="flex flex-col">
-                                <div class="flex justify-between">
-                                  <p class="font-normal">Unfollow</p>
-                                </div>
-                              </div>
-                            </li>
-                          </ul>
-                        </div>
-                      <% end %>
-                    <% end %>
-                    <%= if @has_permissions? do %>
-                      <.link patch={~p"/organizations/#{@organization}/edit"} class="button">
-                        <div type="button" class="inline-flex w-fit justify-center rounded-md border border-zinc-300 bg-white px-4 py-2 text-sm font-medium text-zinc-700 shadow-sm hover:bg-zinc-50" id="sort-menu-button" aria-expanded="false" aria-haspopup="true">
-                          <.icon name="hero-pencil-solid" class="mr-3 h-5 w-5 text-zinc-400" /> Edit
-                        </div>
-                      </.link>
-                      <%= link to: "#", phx_click: "delete", phx_value_id: @organization.id, data: [confirm: "Are you sure?"] do %>
-                        <div type="button" class="inline-flex w-fit justify-center rounded-md border border-zinc-300 bg-white px-4 py-2 text-sm font-medium text-zinc-700 shadow-sm hover:bg-zinc-50" id="sort-menu-button" aria-expanded="false" aria-haspopup="true">
-                          <.icon name="hero-trash-solid" class="mr-3 h-5 w-5 text-zinc-400" /> Delete
-                        </div>
-                      <% end %>
-                    <% end %>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <span class="mt-8 break-normal">{@organization.description}</span>
-        </div>
-      </div>
+<.page title={@page_title} description="@cesium">
+  <:header>
+    <div class="h-32 w-full select-none">
+      <%!-- FIXME: Add banner support --%>
+      <%!-- <%= if @organization.banner do %>
+        <img class="h-32 w-full object-cover" src={Uploaders.Banner.url({@organization.banner, @organization}, :original)} />
+      <% else %> --%>
+      <.gradient seed={@organization.id} class="object-cover" />
+      <%!-- <% end %> --%>
     </div>
-  </div>
-</div>
+  </:header>
+
+  <:actions>
+    <%= if @has_permissions? do %>
+      <p class="sr-only"><%= gettext("Edit") %></p>
+      <.button icon="hero-pencil-solid" color={:white} />
+    <% end %>
+
+    <p class="sr-only"><%= gettext("Contact") %></p>
+    <.link href={"mailto:#{@organization.email}"} target="_blank">
+      <.button icon="hero-envelope-solid" color={:white} />
+    </.link>
+
+    <%= if @current_user && Organizations.user_following?(@current_user.id, @organization.id) do %>
+      <%!-- TODO: Dropdown with unfollow option --%>
+      <.button icon="hero-star-solid" color={:white}><%= gettext("Following") %></.button>
+    <% else %>
+      <%!-- TODO: Follow functionality --%>
+      <.button phx-click={(!@current_user && "must-login") || "follow"} icon="hero-star"><%= gettext("Follow") %></.button>
+    <% end %>
+  </:actions>
+
+  <.tabs class="scrollbar-hide flex overflow-scroll px-4 sm:px-6 lg:px-8">
+    <.link patch="?tab=about" replace={false}>
+      <.tab id="about-tab" active={@current_tab == "about"}>
+        <.icon name="hero-information-circle" class="size-5 mr-2" />
+        <%= gettext("About") %>
+      </.tab>
+    </.link>
+
+    <.link patch="?tab=posts" replace={false}>
+      <.tab id="posts-tab" active={@current_tab == "posts"}>
+        <.icon name="hero-newspaper" class="size-5 mr-2" />
+        <%= gettext("Posts") %>
+      </.tab>
+    </.link>
+
+    <.link patch="?tab=departments" replace={false}>
+      <.tab id="department-tab" active={@current_tab == "departments"}>
+        <.icon name="hero-cube" class="size-5 mr-2" />
+        <%= gettext("Departments") %>
+      </.tab>
+    </.link>
 
-<div class="flex w-full space-x-20">
-  <div class="sm:w-3/4"></div>
-  <div class="sm:w-1/4">
-    <p class="text-md text-zinc-900">
-      People
-    </p>
-    <div class="mt-4 mb-2 grid grid-cols-7 gap-14">
-      <%= for person <- @people do %>
-        <.avatar name={person.name} size={:sm} color={:light_zinc} />
-      <% end %>
+    <.link patch="?tab=partners" replace={false}>
+      <.tab id="partners-tab" active={@current_tab == "partners"}>
+        <.icon name="tabler-heart-handshake" class="size-5 mr-2" />
+        <%= gettext("Partners") %>
+      </.tab>
+    </.link>
+
+    <.link patch="?tab=members" replace={false}>
+      <.tab id="members-tab" active={@current_tab == "members"} number={@member_count}>
+        <.icon name="hero-user-group" class="size-5 mr-2" />
+        <%= gettext("Members") %>
+      </.tab>
+    </.link>
+  </.tabs>
+
+  <div class="mt-8">
+    <div :if={@current_tab == "about"} class="px-4 sm:px-6 lg:px-8">
+      <.about organization={@organization} />
+    </div>
+
+    <div :if={@current_tab == "departments"} class="px-4 sm:px-6 lg:px-8">
+      <.departments_grid organization={@organization} />
+    </div>
+
+    <div :if={@current_tab == "members"} class="px-4 sm:px-6 lg:px-8">
+      <.membership_banner organization={@organization} />
+    </div>
+    <!-- Because divider can't have padding, we need to separate it from the rest of the content -->
+    <div :if={@current_tab == "members"} class="my-8 min-h-full w-full border-b" />
+    <div :if={@current_tab == "members"} class="px-4 sm:px-6 lg:px-8">
+      <!-- Members are directly passed (instead of the whole organization)
+      since their calculation depends on the current tab -->
+      <.memberships_table members={@members} />
     </div>
-    {gettext("View all")}
   </div>
-</div>
+</.page>
diff --git a/lib/atomic_web/live/partner_live/show.ex b/lib/atomic_web/live/partner_live/show.ex
index 522d1feb1..3eae2cd6a 100644
--- a/lib/atomic_web/live/partner_live/show.ex
+++ b/lib/atomic_web/live/partner_live/show.ex
@@ -4,9 +4,8 @@ defmodule AtomicWeb.PartnerLive.Show do
   import AtomicWeb.Components.{Avatar, Socials}
   import AtomicWeb.LiveHelpers
 
-  alias Atomic.Accounts
-  alias Atomic.Organizations
-  alias Atomic.Partners
+  alias Atomic.{Accounts, Organizations, Partners}
+  alias Atomic.{Location, Socials}
 
   @impl true
   def mount(_params, _session, socket) do
@@ -32,6 +31,9 @@ defmodule AtomicWeb.PartnerLive.Show do
      |> assign(:has_permissions?, has_permissions?(socket, organization_id))}
   end
 
+  defp related_partners(current, partners),
+    do: Enum.filter(partners, fn partner -> partner.id != current.id end)
+
   defp has_permissions?(socket, _organization_id) when not socket.assigns.is_authenticated?,
     do: false
 
diff --git a/lib/atomic_web/live/partner_live/show.html.heex b/lib/atomic_web/live/partner_live/show.html.heex
index 5833bb632..c303d2b6d 100644
--- a/lib/atomic_web/live/partner_live/show.html.heex
+++ b/lib/atomic_web/live/partner_live/show.html.heex
@@ -1,34 +1,27 @@
-<.page title="Partners">
-  <:actions>
-    <%= if @has_permissions? do %>
-      <div class="lg:border-primary-500 lg:block">
-        <.button navigate={~p"/organizations/#{@organization}/partners/#{@partner}/edit"} icon="hero-pencil">
-          {gettext("Edit Partner")}
-        </.button>
-      </div>
-    <% end %>
+<.page title={@page_title}>
+  <:actions :if={@has_permissions?}>
+    <.button navigate={~p"/organizations/#{@organization}/partners/#{@partner}/edit"} icon="hero-pencil">
+      <%= gettext("Edit Partner") %>
+    </.button>
   </:actions>
+
   <div class="border-t-100 min-h-fit max-w-5xl select-none sm:mx-6 sm:px-0 lg:mx-0 lg:px-8">
     <div class="mt-6 flex flex-col gap-2 sm:justify-center">
       <div class="flex flex-row">
         <div class="flex flex-col items-center px-2 lg:justify-none">
           <.avatar color={:light_zinc} name={@partner.name} src={Uploaders.PartnerImage.url({@partner.image, @partner}, :original)} type={:company} size={:xl} />
         </div>
+
         <div>
           <div class="flex items-center justify-between">
-            <h1 class="text-wrap ml-2 flex-1 select-none truncate pr-4 text-xl font-bold text-zinc-900 sm:text-2xl">
-              {@partner.name}
+            <h1 class="text-wrap flex-1 select-none truncate text-xl font-bold text-zinc-900 sm:text-2xl">
+              <%= @partner.name %>
             </h1>
           </div>
-          <%= if @partner.location do %>
-            <!-- Location -->
-            <div class="text-md flex flex-row items-center gap-x-1 leading-6">
-              <.icon name="hero-map-pin" class="h-5 w-5 text-zinc-400" />
-              <.link class="text-blue-500" href={"https://www.google.com/maps/search/?api=1&query=#{@partner.location.name}"}>
-                {@partner.location.name}
-              </.link>
-            </div>
-          <% end %>
+          <.link :if={@partner.location} href={Location.link(@partner.location)} target="_blank" class="group flex flex-row items-center space-x-1">
+            <.icon name={:map_pin} class="size-4" />
+            <p class="text-sm group-hover:underline"><%= @partner.location.name %></p>
+          </.link>
 
           <%= if @partner.socials do %>
             <!-- Socials and Website -->
@@ -48,6 +41,7 @@
           <% end %>
         </div>
       </div>
+
       <div>
         <div class="mt-1 px-2 py-4 text-zinc-800">
           <div class="flex flex-row items-center gap-x-2">
@@ -61,47 +55,16 @@
           </span>
         </div>
         <div class="px-2 py-4 text-zinc-800">
-          <div class="flex flex-row items-center gap-x-2 text-zinc-800">
+        <div class="px-2 py-4 text-zinc-800">
             <.icon name="hero-signal" class="size-5 mb-2" />
             <h2 class="mb-2 flex-1 truncate text-lg font-semibold text-zinc-900">Benefits</h2>
           </div>
           <span>
             <%= Enum.map(String.split(@partner.benefits, "\n"), fn phrase -> %>
-              <%= if String.length(phrase) < 300 do %>
-                {phrase}
-              <% else %>
-                {String.slice(phrase, 0..300)}
-              <% end %>
+              <%= maybe_slice_string(phrase, 300) %>
             <% end) %>
           </span>
         </div>
-        <%= if @partners do %>
-          <div class="flex flex-col gap-x-2 text-zinc-800">
-            <div class="flex flex-row items-center gap-x-2 px-2">
-              <.icon name="hero-star" class="size-5 mb-2" />
-              <h2 class="mb-2 flex-1 select-none truncate py-2 text-lg font-semibold text-zinc-900">Related Partners</h2>
-            </div>
-            <div class="sm:grid sm:grid-cols-2 sm:gap-px">
-              <%= for partner <- @partners |> Enum.filter(fn partner -> partner.id != @partner.id end) do %>
-                <div class="group relative m-2 rounded-lg border border-zinc-200 bg-white p-4 hover:bg-zinc-50">
-                  <.link href={~p"/organizations/#{@organization}/partners/#{@partner}"}>
-                    <div class="flex flex-row items-center space-x-2">
-                      <.avatar color={:light_zinc} name={partner.name} src={Uploaders.PartnerImage.url({partner.image, partner}, :original)} type={:company} size={:xs} />
-                      <h1 class="text-lg font-semibold text-zinc-800">{partner.name}</h1>
-                    </div>
-                    <%= if partner.location do %>
-                      <div class="flex flex-row items-center gap-x-1">
-                        <.icon name="hero-map-pin" class="size-5 text-zinc-400" />
-                        <span class="text-blue-500">{partner.location.name}</span>
-                      </div>
-                    <% end %>
-                    <span class="text-md text-zinc-500">{partner.description}</span>
-                  </.link>
-                </div>
-              <% end %>
-            </div>
-          </div>
-        <% end %>
       </div>
     </div>
   </div>
diff --git a/lib/atomic_web/router.ex b/lib/atomic_web/router.ex
index 8d2376c0a..da52c3ddf 100644
--- a/lib/atomic_web/router.ex
+++ b/lib/atomic_web/router.ex
@@ -54,11 +54,7 @@ defmodule AtomicWeb.Router do
     ]
 
     live_session :admin, on_mount: [{AtomicWeb.Hooks, :current_user_state}] do
-      live "/organizations/new", OrganizationLive.New, :new
-
       scope "/organizations/:organization_id" do
-        live "/edit", OrganizationLive.Edit, :edit
-
         scope "/activities" do
           pipe_through :confirm_activity_association
           live "/new", ActivityLive.New, :new
@@ -96,14 +92,16 @@ defmodule AtomicWeb.Router do
       live "/", HomeLive.Index, :index
       live "/calendar", CalendarLive.Show, :show
       live "/activities", ActivityLive.Index, :index
+
       live "/organizations", OrganizationLive.Index, :index
+      live "/organizations/:id", OrganizationLive.Show, :show
+
       live "/announcements", AnnouncementLive.Index, :index
       live "/tos", TermsLive.Show, :show
       live "/privacy", PrivacyLive.Show, :show
       live "/cookies", CookiesLive.Show, :show
 
       live "/activities/:id", ActivityLive.Show, :show
-      live "/organizations/:organization_id", OrganizationLive.Show, :show
       live "/announcements/:id", AnnouncementLive.Show, :show
 
       live "/profile/:slug", ProfileLive.Show, :show
@@ -142,10 +140,6 @@ defmodule AtomicWeb.Router do
           live "/:id", AnnouncementLive.Show, :show
         end
       end
-
-      # Only masters can create organizations
-      pipe_through [:master]
-      live "/organizations/new", OrganizationLive.New, :new
     end
   end
 
diff --git a/priv/fake/organizations.json b/priv/fake/organizations.json
index 453eac32c..7a5910b97 100644
--- a/priv/fake/organizations.json
+++ b/priv/fake/organizations.json
@@ -1,232 +1,232 @@
 [
   {
-      "name": "ADAUM",
-      "long_name": "Associação de Debates Académicos da Universidade do Minho",
-      "description": "Associação de Debates Académicos da Universidade do Minho"
+    "name": "ADAUM",
+    "long_name": "Associação de Debates Académicos da Universidade do Minho",
+    "description": "A ADAUM é uma associação da Universidade do Minho que tem por fim promover o debate competitivo, bem como o espírito crítico."
   },
   {
-      "name": "ADEGE",  
-      "long_name": "Associação de Estudantes de Gestão da Universidade do Minho",
-      "description": "Associação de Estudantes de Gestão da Universidade do Minho"
+    "name": "ADEGE",
+    "long_name": "Associação de Estudantes de Gestão da Universidade do Minho",
+    "description": "A ADEGE é o órgão representativo de todos os estudantes do Licenciatura em Gestão, da Escola de Economia e Gestão da Universidade do Minho (EEG-UM)."
   },
   {
-      "name": "AEDUM",
-      "long_name": "Associação de Estudantes de Direito da Universidade do Minho",
-      "description": "Associação de Estudantes de Direito da Universidade do Minho"
+    "name": "AEDUM",
+    "long_name": "Associação de Estudantes de Direito da Universidade do Minho",
+    "description": "A Associação de Estudantes de Direito da Universidade do Minho é uma associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Direito, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "AEECUM",
-      "long_name": "Associação de Estudantes de Engenharia Civil da Universidade do Minho",   
-      "description": "Associação Estudantes Engenharia Civil da Universidade do Minho"
+    "name": "AEECUM",
+    "long_name": "Associação de Estudantes de Engenharia Civil da Universidade do Minho",
+    "description": "Associação sempre ao serviço dos estudantes de Engenharia Civil da Universidade do Minho!"
   },
   {
-      "name": "AEESECG",
-      "long_name": "Associação de Estudantes da Escola Superior de Enfermagem Calouste Gulbenkian",
-      "description": "Associação de Estudantes da Escola Superior de Enfermagem Calouste Gulbenkian"
+    "name": "AEESECG",
+    "long_name": "Associação de Estudantes da Escola Superior de Enfermagem Calouste Gulbenkian",
+    "description": "A AEESECG tem como objectivo primordial representar e defender os interesses dos estudantes da ESE-UM. Fomentar as relações de cooperação e amizade aos antigos alunos da AEESECG, promover a formação cultural e humana da comunidade estudantil, através da dinamização de actividades cientifico-pedagógicacas, sócio-culturais, recreativas e desportivas. Além disso pretende desenvolver a cooperação e solidariedade entre os estudantes da ESE-UM, promovendo uma política de igualdade de oportunidades."
   },
   {
-      "name": "AEHUM",
-      "long_name": "Associação de Estudantes de História da Universidade do Minho",
-      "description": "Associação de Estudantes da História da Universidade do Minho"
+    "name": "AEHUM",
+    "long_name": "Associação de Estudantes de História da Universidade do Minho",
+    "description": "A Associação de Estudantes de História da Universidade do Minho é uma associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de História, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "AEPUM",
-      "long_name": "Associação de Estudantes de Psicologia da Universidade do Minho",
-      "description": "Associação de Estudantes de Psicologia da Universidade do Minho"
+    "name": "AEPUM",
+    "long_name": "Associação de Estudantes de Psicologia da Universidade do Minho",
+    "description": "A Associação de Estudantes de Psicologia da Universidade do Minho é uma associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Psicologia, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "AIESEC Minho",
-      "long_name": "Association Internationale des Etudiants en Sciences Economiques et Commerciales – UMinho",
-      "description": "Association Internationale des Etudiants en Sciences Economiques et Commerciales – UMinho"
+    "name": "AIESEC Minho",
+    "long_name": "Association Internationale des Etudiants en Sciences Economiques et Commerciales – UMinho",
+    "description": "A Association Internationale des Etudiants en Sciences Economiques et Commerciales – UMinho é uma associação de estudantes da Universidade do Minho que tem como objetivo dotar os seus membros de competências de liderança e empreendedorismo, bem como promover a mobilidade internacional dos estudantes."
   },
   {
-      "name": "AIS.SC",
-      "long_name": "Association for Information Systems Student Chapter",
-      "description": "Association for Information Systems Student Chapter"
+    "name": "AIS.SC",
+    "long_name": "Association for Information Systems Student Chapter",
+    "description": "A Association for Information Systems Student Chapter é uma associação de estudantes da Universidade do Minho que tem como objetivo promover a partilha de conhecimento e experiências na área dos sistemas de informação, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "A3RUM",
-      "long_name": "Associação de Alunos de Arqueologia da Universidade do Minho",
-      "description": "Associação de Alunos de Arqueologia da Universidade do Minho"
+    "name": "A3RUM",
+    "long_name": "Associação de Alunos de Arqueologia da Universidade do Minho",
+    "description": "A Associação de Alunos de Arqueologia da Universidade do Minho é uma associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Arqueologia, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "CEAP",
-      "long_name": "Centro de Estudos de Administração Pública",
-      "description": "Centro de Estudos de Administração Pública"
+    "name": "CEAP",
+    "long_name": "Centro de Estudos de Administração Pública",
+    "description": "O Centro de Estudos de Administração Pública é um associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Administração Pública, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "CECRI",
-      "long_name": "Centro de Estudos de Comunicação e Relações Internacionais",
-      "description": "Centro de Estudos do Curso de Relações Internacionais"
+    "name": "CECRI",
+    "long_name": "Centro de Estudos de Comunicação e Relações Internacionais",
+    "description": "O Centro de Estudos de Comunicação e Relações Internacionais é um associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Comunicação e Relações Internacionais, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "CeSIUM",
-      "long_name": "Centro de Estudantes de Engenharia Informática da Universidade do Minho",
-      "description": "Centro de Estudantes de Engenharia de Sistemas e Informática da Universidade do Minho"
+    "name": "CeSIUM",
+    "long_name": "Centro de Estudantes de Engenharia Informática da Universidade do Minho",
+    "description": "O CeSIUM é um grupo de estudantes voluntários, que tem como objetivo representar e promover o curso de Engenharia Informática 💾 na UMinho 🎓"
   },
   {
-      "name": "CineFOCUM",
-      "long_name": "Núcleo de Cinemas da Universidade do Minho",
-      "description": "Núcleo de Cinema da Universidade do Minho"
+    "name": "CineFOCUM",
+    "long_name": "Núcleo de Cinema da Universidade do Minho",
+    "description": "O CineFOCUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a cultura cinematográfica, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "ELSA",
-      "long_name": "European Law Students Association",
-      "description": "European Law Students Association"
+    "name": "ELSA",
+    "long_name": "European Law Students Association",
+    "description": "ELSA UMinho é uma afiliação da ELSA Portugal, que por sua vez é uma afiliação da ELSA International. A ELSA é a maior associação de estudantes de Direito do mundo, com mais de 60,000 membros em 43 países."
   },
   {
-      "name": "GAEB",
-      "long_name": "Grupo de Alunos de Engenharia Biomédica",
-      "description": "Grupo de Alunos de Engenharia Biomédica"
+    "name": "GAEB",
+    "long_name": "Grupo de Alunos de Engenharia Biomédica",
+    "description": "O GAEB é um grupo de alunos da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Engenharia Biomédica, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "GACCUM",
-      "long_name": "Grupo de Alunos de Ciências da Comunicação",
-      "description": "Grupo dos Alunos de Ciências da Comunicação"
+    "name": "GACCUM",
+    "long_name": "Grupo de Alunos de Ciências da Comunicação",
+    "description": "O Grupo de Alunos de Ciências da Comunicação é uma associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Ciências da Comunicação, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "GeoPlanUM",
-      "long_name": "Associação dos Estudantes de Geografia e Planeamento da Universidade do Minho",
-      "description": "Associação dos Estudantes de Geografia e Planeamento da Universidade do Minho"
+    "name": "GeoPlanUM",
+    "long_name": "Associação dos Estudantes de Geografia e Planeamento da Universidade do Minho",
+    "description": "O GeoPlanUM é uma associação de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Geografia e Planeamento, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "Music UM",
-      "long_name": "Núcleo de Estudantes de Música da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Música da Universidade do Minho"
+    "name": "Music UM",
+    "long_name": "Núcleo de Estudantes de Música da Universidade do Minho",
+    "description": "O Music UM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a cultura musical, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NAECUM",
-      "long_name": "Núcleo de Alunos de Economia da Universidade do Minho",
-      "description": "Núcleo de Alunos de Economia da Universidade do Minho"
+    "name": "NAECUM",
+    "long_name": "Núcleo de Alunos de Economia da Universidade do Minho",
+    "description": "O NAECUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Economia, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NAMECUM",
-      "long_name": "Núcleo de Alunos de Engenharia Mecânica da Universidade do Minho",
-      "description": "Núcleo de Alunos de Engenharia Mecânica da Universidade do Minho"
+    "name": "NAMECUM",
+    "long_name": "Núcleo de Alunos de Engenharia Mecânica da Universidade do Minho",
+    "description": "O NAMECUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Engenharia Mecânica, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NAQUM",
-      "long_name": "Núcleo de Alunos de Química da Universidade do Minho",
-      "description": "Núcleo de Alunos de Química da Universidade do Minho"
+    "name": "NAQUM",
+    "long_name": "Núcleo de Alunos de Química da Universidade do Minho",
+    "description": "O NAQUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Química, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEAUM",
-       "long_name": "Núcleo de Estudantes de Arquitetura da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Arquitetura da Universidade do Minho"
+    "name": "NEAUM",
+    "long_name": "Núcleo de Estudantes de Arquitetura da Universidade do Minho",
+    "description": "O NEAUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Arquitetura, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEBAUM",
-      "long_name": "Núcleo de Estudantes de Biologia Aplicada da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Biologia Aplicada da Universidade do Minho"
+    "name": "NEBAUM",
+    "long_name": "Núcleo de Estudantes de Biologia Aplicada da Universidade do Minho",
+    "description": "O NEBAUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Biologia Aplicada, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEBQUM",
-      "long_name": "Núcleo de Estudantes de Bioquímica da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Bioquímica da Universidade do Minho"
+    "name": "NEBQUM",
+    "long_name": "Núcleo de Estudantes de Bioquímica da Universidade do Minho",
+    "description": "O NEBQUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Bioquímica, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NECC",
-      "long_name": "Núcleo de Estudantes de Ciências da Comunicação da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Ciências da Computação da Universidade do Minho"
+    "name": "NECC",
+    "long_name": "Núcleo de Estudantes de Ciências da Computação da Universidade do Minho",
+    "description": "O NECC é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Ciências da Computação, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NECSUM",
-      "long_name": "Núcleo de Estudantes do Curso da Sociologia da Universidade do Minho",
-      "description": "Núcleo de Estudantes do Curso de Sociologia da Universidade do Minho"
+    "name": "NECSUM",
+    "long_name": "Núcleo de Estudantes do Curso da Sociologia da Universidade do Minho",
+    "description": "O NECSUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Sociologia, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEDUM",
-      "long_name": "Núcleo de Estudantes de Educação da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Educação da Universidade do Minho"
+    "name": "NEDUM",
+    "long_name": "Núcleo de Estudantes de Educação da Universidade do Minho",
+    "description": "O NEDUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Educação, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEEB",
-      "long_name": "Núcleo de Estudantes de Engenharia Biológica",
-      "description": "Núcleo de Estudos de Engenharia Biológica"
+    "name": "NEEB",
+    "long_name": "Núcleo de Estudantes de Engenharia Biológica",
+    "description": "O NEEB é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Engenharia Biológica, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEEBUM",
-      "long_name": "Núcleo de Estudantes de Educação Básica da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Educação Básica da Universidade do Minho"
+    "name": "NEEBUM",
+    "long_name": "Núcleo de Estudantes de Educação Básica da Universidade do Minho",
+    "description": "O NEEBUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Educação Básica, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEECUM",
-      "long_name": "Núcleo de Estudantes de Engenharia de Comunicações da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Engenharia de Comunicações da Universidade do Minho"
+    "name": "NEECUM",
+    "long_name": "Núcleo de Estudantes de Engenharia de Comunicações da Universidade do Minho",
+    "description": "O NEECUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Engenharia de Comunicações, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEEGIUM",
-      "long_name": "Núcleo de Estudantes de Engenharia e Gestão Industrial da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Engenharia e Gestão Industrial da Universidade do Minho"
+    "name": "NEEGIUM",
+    "long_name": "Núcleo de Estudantes de Engenharia e Gestão Industrial da Universidade do Minho",
+    "description": "O NEEGIUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Engenharia e Gestão Industrial, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEEUM",
-      "long_name": "Núcleo de Estudantes de Estatística da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Estatística da Universidade do Minho"
+    "name": "NEEUM",
+    "long_name": "Núcleo de Estudantes de Estatística da Universidade do Minho",
+    "description": "O NEEUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Estatística, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEFILUM",
-      "long_name": "Núcleo de Estudantes de Filosofia da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Filosofia da Universidade do Minho"
+    "name": "NEFILUM",
+    "long_name": "Núcleo de Estudantes de Filosofia da Universidade do Minho",
+    "description": "O NEFILUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Filosofia, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEFUM",
-      "long_name": "Núcleo de Estudantes de Física da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Física da Universidade do Minho"
+    "name": "NEFUM",
+    "long_name": "Núcleo de Estudantes de Física da Universidade do Minho",
+    "description": "O NEFUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Física, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEIEEEUM",
-      "long_name": "Núcleo de Estudantes de Engenharia Eletrotécnica e de Computadores da Universidade do Minho",
-      "description": "Núcleo Estudantil do Institute of Electrical & Electronics Engineers da Universidade do Minho"
+    "name": "NEIEEEUM",
+    "long_name": "Núcleo Estudantil do Institute of Electrical & Electronics Engineers da Universidade do Minho",
+    "description": "O NEIEEUM é uma afiliação do Institute of Electrical & Electronics Engineers (IEEE) na Universidade do Minho."
   },
   {
-      "name": "NELAUM",
-      "long_name": "Núcleo de Estudantes de Línguas Aplicadas da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Línguas Aplicadas da Universidade do Minho"
+    "name": "NELAUM",
+    "long_name": "Núcleo de Estudantes de Línguas Aplicadas da Universidade do Minho",
+    "description": "O NELAUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Línguas Aplicadas, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEMUM",
-      "long_name": "Núcleo de Estudantes de Medicina da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Medicina da Universidade do Minho"
+    "name": "NEMUM",
+    "long_name": "Núcleo de Estudantes de Medicina da Universidade do Minho",
+    "description": "O NEMUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Medicina, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NENIUM",
-      "long_name": "Núcleo de Estudantes de Negócios Internacionais da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Negócios Internacionais da Universidade do Minho"
+    "name": "NENIUM",
+    "long_name": "Núcleo de Estudantes de Negócios Internacionais da Universidade do Minho",
+    "description": "O NENIUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Negócios Internacionais, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEOUM",
-      "long_name": "Núcleo de Estudantes de Optometria da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Optometria da Universidade do Minho"
+    "name": "NEOUM",
+    "long_name": "Núcleo de Estudantes de Optometria da Universidade do Minho",
+    "description": "O NEOUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Optometria, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEPLUM",
-      "long_name": "Núcleo de Estudantes de Estudos Portugueses e Lusófonos da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Estudos Portugueses e Lusófonos da Universidade do Minho"
+    "name": "NEPLUM",
+    "long_name": "Núcleo de Estudantes de Estudos Portugueses e Lusófonos da Universidade do Minho",
+    "description": "O NEPLUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Estudos Portugueses e Lusófonos, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-      "name": "NEMKT",
-      "long_name": "Núcleo de Estudantes de Marketing da Universidade do Minho",
-      "description": "Núcleo de Estudantes de Marketing da Universidade do Minho"
+    "name": "NEMKT",
+    "long_name": "Núcleo de Estudantes de Marketing da Universidade do Minho",
+    "description": "O NEMKT é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Marketing, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
     "name": "NUCCLEUM",
     "long_name": "Núcleo de Estudantes de Linguas e Literaturas Europeias da Universidade do Minho",
-    "description": "Núcleo de Estudantes de Linguas e Literaturas Europeias da Universidade do Minho"
+    "description": "O NUCCLEUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Linguas e Literaturas Europeias, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
-    "name": "Núcleo de Estudante de Contabilidade da Universidade do Minho",
+    "name": "NECONTUM",
     "long_name": "Núcleo de Estudante de Contabilidade da Universidade do Minho",
-    "description": "Núcleo de Estudante de Contabilidade da Universidade do Minho"
+    "description": "O NECONTUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Contabilidade, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
     "name": "NUMERUM",
     "long_name": "Núcleo de Estudantes de Matemática da Universidade do Minho",
-    "description": "Núcleo de Estudantes de Matemática da Universidade do Minho"
+    "description": "O NUMERUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Matemática, bem como a realização de atividades culturais, desportivas e de lazer."
   },
   {
     "name": "PoliticUM",
-    "long_name": "PoliticUM",
-    "description": "PoliticUM"
+    "long_name": "Núcleo de Estudantes de Ciência Política da Universidade do Minho",
+    "description": "O PoliticUM é um núcleo de estudantes da Universidade do Minho que tem como objetivo promover a integração dos estudantes do curso de Ciência Política, bem como a realização de atividades culturais, desportivas e de lazer."
   }
 ]
diff --git a/priv/repo/migrations/2022000000000_create_organizations.exs b/priv/repo/migrations/2022000000000_create_organizations.exs
index d725bdd89..0a0795e31 100644
--- a/priv/repo/migrations/2022000000000_create_organizations.exs
+++ b/priv/repo/migrations/2022000000000_create_organizations.exs
@@ -6,11 +6,16 @@ defmodule Atomic.Repo.Migrations.CreateOrganizations do
       add :id, :binary_id, primary_key: true
 
       add :name, :string, null: false
+      add :email, :string, null: false
       add :long_name, :string, null: false
       add :description, :text, null: false
 
       add :logo, :string
-      add :location, :map
+      add :location, :string
+
+      add :follower_count, :integer
+
+      add :socials, :map
 
       timestamps()
     end
diff --git a/priv/repo/seeds/organizations.exs b/priv/repo/seeds/organizations.exs
index b0d25b2e1..dfb9c162c 100644
--- a/priv/repo/seeds/organizations.exs
+++ b/priv/repo/seeds/organizations.exs
@@ -23,13 +23,17 @@ defmodule Atomic.Repo.Seeds.Organizations do
     # Seed CeSIUM
     %Organization{
       name: "CeSIUM",
-      long_name:
-        "CeSIUM - Centro de Estudantes de Engenharia Informática da Universidade do Minho",
+      email: "cesium@di.uminho.pt",
+      long_name: "Centro de Estudantes de Engenharia Informática da Universidade do Minho",
       description:
         "O CeSIUM é um grupo de estudantes voluntários, que tem como objetivo representar e promover o curso de Engenharia Informática 💾 na UMinho 🎓",
-      location: %{
-        name: "Departamento de Informática, Campus de Gualtar, Universidade do Minho",
-        url: "https://cesium.di.uminho.pt"
+      location: "Edifício 7, Universidade do Minho",
+      socials: %{
+        facebook: "cesiuminho",
+        instagram: "cesiuminho",
+        x: "cesiuminho",
+        linkedin: "cesiuminho",
+        website: "https://cesium.pt"
       }
     }
     |> Repo.insert!()
@@ -50,8 +54,12 @@ defmodule Atomic.Repo.Seeds.Organizations do
           {:ok, new_org} =
             %{
               name: organization["name"],
+              email: Faker.Internet.email(),
               long_name: organization["long_name"],
-              description: organization["description"]
+              description: organization["description"],
+              socials: %{
+                website: Faker.Internet.url()
+              }
             }
             |> Organizations.create_organization()
 
diff --git a/priv/repo/seeds/partners.exs b/priv/repo/seeds/partners.exs
index 0d50bb0bd..74f4f1bd3 100644
--- a/priv/repo/seeds/partners.exs
+++ b/priv/repo/seeds/partners.exs
@@ -24,11 +24,10 @@ defmodule Atomic.Repo.Seeds.Partners do
     }
 
     socials = %{
-      instagram: Faker.Internet.slug(),
       facebook: Faker.Internet.slug(),
+      instagram: Faker.Internet.slug(),
       x: Faker.Internet.slug(),
-      youtube: Faker.Internet.slug(),
-      tiktok: Faker.Internet.slug(),
+      linkedin: Faker.Internet.slug(),
       website: Faker.Internet.url()
     }
 
diff --git a/priv/static/images/facebook.svg b/priv/static/images/facebook.svg
index 92b7016c8..a3471f59c 100644
--- a/priv/static/images/facebook.svg
+++ b/priv/static/images/facebook.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#A1A1AA" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M512 256C512 114.6 397.4 0 256 0S0 114.6 0 256C0 376 82.7 476.8 194.2 504.5V334.2H141.4V256h52.8V222.3c0-87.1 39.4-127.5 125-127.5c16.2 0 44.2 3.2 55.7 6.4V172c-6-.6-16.5-1-29.6-1c-42 0-58.2 15.9-58.2 57.2V256h83.6l-14.4 78.2H287V510.1C413.8 494.8 512 386.9 512 256h0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M512 256C512 114.6 397.4 0 256 0S0 114.6 0 256C0 376 82.7 476.8 194.2 504.5V334.2H141.4V256h52.8V222.3c0-87.1 39.4-127.5 125-127.5c16.2 0 44.2 3.2 55.7 6.4V172c-6-.6-16.5-1-29.6-1c-42 0-58.2 15.9-58.2 57.2V256h83.6l-14.4 78.2H287V510.1C413.8 494.8 512 386.9 512 256h0z"/></svg>
\ No newline at end of file
diff --git a/priv/static/images/x.svg b/priv/static/images/x.svg
index e704e9dfb..181016d4d 100644
--- a/priv/static/images/x.svg
+++ b/priv/static/images/x.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#A1A1AA" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>
\ No newline at end of file
diff --git a/test/atomic/organizations_test.exs b/test/atomic/organizations_test.exs
index a116ba5a0..b42d25f88 100644
--- a/test/atomic/organizations_test.exs
+++ b/test/atomic/organizations_test.exs
@@ -78,17 +78,7 @@ defmodule Atomic.OrganizationsTest do
       membership = insert(:membership, role: :admin)
 
       memberships =
-        Organizations.list_memberships(%{"organization_id" => membership.organization_id})
-        |> Enum.map(& &1.id)
-
-      assert memberships == [membership.id]
-    end
-
-    test "list_memberships/1 returns all memberships of user" do
-      membership = insert(:membership)
-
-      memberships =
-        Organizations.list_memberships(%{"user_id" => membership.user_id})
+        Organizations.list_memberships(membership.organization_id)
         |> Enum.map(& &1.id)
 
       assert memberships == [membership.id]