diff --git a/app/controllers/org/admin/members_controller.rb b/app/controllers/org/admin/members_controller.rb
index 9fa95200..aae7efea 100644
--- a/app/controllers/org/admin/members_controller.rb
+++ b/app/controllers/org/admin/members_controller.rb
@@ -1,6 +1,6 @@
 module Org
   class Admin::MembersController < Admin::BaseController
-    before_action :set_member, only: [:show, :edit, :update, :mock, :profile, :token, :destroy]
+    before_action :set_member, only: [:show, :edit, :update, :mock, :edit_roles, :token, :destroy]
     before_action :set_new_member, only: [:new, :create, :options]
 
     def index
@@ -41,7 +41,8 @@ def options
       @member_department = @member.member_departments.build(department_id: params[:node_id])
     end
 
-    def profile
+    def edit_roles
+      @roles = Roled::MemberRole.all
     end
 
     def edit
diff --git a/app/views/org/admin/members/_base/_index_tbody.html.erb b/app/views/org/admin/members/_base/_index_tbody.html.erb
index ccec224d..6e73bd1a 100644
--- a/app/views/org/admin/members/_base/_index_tbody.html.erb
+++ b/app/views/org/admin/members/_base/_index_tbody.html.erb
@@ -19,9 +19,6 @@
     <% model.roles.pluck(:name).each do |role| %>
       <span class="tag"><%= role %></span>
     <% end %>
-    <%= link_to({ controller: 'roled/admin/who_roles', action: 'show', who_type: 'Org::Member', who_id: model.id }, data: { turbo_frame: 'modal' }) do %>
-      <i class="fa-solid fa-user-shield"></i>
-    <% end %>
   </div>
 </td>
 <td>
diff --git a/app/views/org/admin/members/_base/_index_tr.html.erb b/app/views/org/admin/members/_base/_index_tr.html.erb
index 521ff867..f3de3d91 100644
--- a/app/views/org/admin/members/_base/_index_tr.html.erb
+++ b/app/views/org/admin/members/_base/_index_tr.html.erb
@@ -5,16 +5,19 @@
       <%= button_to({ action: 'show', id: model.id }, aria: { label: t('.show.title') }, class: 'button is-small is-rounded is-light') do %>
         <i class="fa-solid fa-circle-info text-info"></i>
       <% end %>
-      <%= link_to({ action: 'profile', id: model.id }, aria: { label: t('.profile') }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fa-solid fa-id-card text-info"></i>
-      <% end %>
+
       <%= button_to({ action: 'edit', id: model.id }, aria: { label: t('.edit.title') }, class: 'button is-small is-rounded is-light') do %>
         <i class="fa-solid fa-pencil text-link"></i>
       <% end %>
       <%= button_to({ action: 'destroy', id: model.id }, method: :delete, aria: { label: t('.destroy.title') }, class: 'button is-small is-rounded is-light', form: { data: { turbo_confirm: t('.destroy.confirm') } }) do %>
         <i class="fa-solid fa-trash text-danger"></i>
       <% end %>
-      <%# link_to 'tutorials', admin_tutorials_path(member_id: model.id), class: 'ui mini circular button' %>
+    </div>
+    <div data-show-target="item" class="visibility-hidden">
+      <%= button_to({ action: 'edit_roles', id: model.id }, class: 'button is-small is-rounded is-light') do %>
+        <i class="fa-solid fa-user-shield"></i>
+        <span class="ml-1"><%= t('.edit_roles.title') %></span>
+      <% end %>
     </div>
   </td>
 </tr>
diff --git a/app/views/org/admin/members/_role_form.html.erb b/app/views/org/admin/members/_role_form.html.erb
new file mode 100644
index 00000000..70d14882
--- /dev/null
+++ b/app/views/org/admin/members/_role_form.html.erb
@@ -0,0 +1,8 @@
+<%= form_with theme: 'modal', model: @member, url: { action: 'update' } do |f| %>
+  <%= render 'modal_header' %>
+  <div class="modal-card-body">
+    <%= render 'error_messages', target: @member %>
+    <%= f.collection_check_boxes :role_ids, @roles, :id, :name %>
+  </div>
+  <%= f.submit %>
+<% end %>
diff --git a/app/views/org/admin/members/edit_roles.turbo_stream.erb b/app/views/org/admin/members/edit_roles.turbo_stream.erb
new file mode 100644
index 00000000..1daad094
--- /dev/null
+++ b/app/views/org/admin/members/edit_roles.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.append 'body', partial: 'role_form', layout: 'modal_form' %>
diff --git a/app/views/org/admin/members/profile.html.erb b/app/views/org/admin/members/profile.html.erb
deleted file mode 100644
index 44a3d9f2..00000000
--- a/app/views/org/admin/members/profile.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= render 'org/admin/members/menu' %>
-
-<table class="table is-hoverable is-fullwidth">
-  <thead>
-    <tr>
-      <th class="three wide"></th>
-      <th>
-        <%= link_to t('.edit.title'), edit_admin_profile_path(@member.profile), class: 'ui mini blue right floated button' %>
-      </th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= render 'show_table' %>
-  </tbody>
-</table>
-
diff --git a/app/views/org/admin/members/profile.turbo_stream.erb b/app/views/org/admin/members/profile.turbo_stream.erb
deleted file mode 100644
index 70624a37..00000000
--- a/app/views/org/admin/members/profile.turbo_stream.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= turbo_stream.append 'body', partial: 'show_table', layout: 'modal' %>