diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
index e783bc2a..f9f020bb 100644
--- a/app/views/events/_form.html.erb
+++ b/app/views/events/_form.html.erb
@@ -18,7 +18,7 @@
 
   <div class="my-5">
     <%= form.label :description %>
-    <%= form.text_area :description, rows: 4, class: "input input-bordered w-full" %>
+    <%= form.text_area :description, rows: 4, class: "textarea textarea-bordered w-full" %>
   </div>
 
   <div class="my-5">
@@ -26,17 +26,8 @@
     <%= form.text_field :website, class: "input input-bordered w-full" %>
   </div>
 
-  <div class="my-5">
-    <%= form.label :kind %>
-    <%= form.number_field :kind, class: "input input-bordered w-full" %>
-  </div>
-
-  <div class="my-5">
-    <%= form.label :frequency %>
-    <%= form.number_field :frequency, class: "input input-bordered w-full" %>
-  </div>
-
   <div class="inline">
-    <%= form.submit class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
+    <%= ui_button "Suggest modifications", type: :submit %>
+    <%= ui_button "Cancel", url: event_path(event), outline: true, role: :button %>
   </div>
 <% end %>
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index e511c96d..8d1d123b 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -2,7 +2,4 @@
   <h1 class="font-bold text-4xl">Editing event</h1>
 
   <%= render "form", event: @event %>
-
-  <%= link_to "Show this event", @event, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
-  <%= link_to "Back to events", events_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
 </div>