diff --git a/app/views/admin/communication/websites/agenda/events/_form.html.erb b/app/views/admin/communication/websites/agenda/events/_form.html.erb
index f28e1850bbfd002d499919f5f9bd00074b0c22a4..576ba9c86683bd85324da3d3050d4f6146daa576 100644
--- a/app/views/admin/communication/websites/agenda/events/_form.html.erb
+++ b/app/views/admin/communication/websites/agenda/events/_form.html.erb
@@ -8,6 +8,7 @@
         <%= f.input :title %>
         <%= render 'admin/application/summary/form', f: f, about: event %>
       <% end %>
+      <%= osuny_panel Communication::Website::Agenda::Event.human_attribute_name('dates') do %>
       <div class="row pure__row--small">
         <div class="col-md-6">
           <%= f.input :from_day, html5: true %>
@@ -24,11 +25,8 @@
           <%= f.input :to_hour, html5: true %>
         </div>
       </div>
-      <div class="row pure__row--small">
-        <div class="col-md-6">
-          <%= render 'admin/application/meta_description/form', f: f, about: event %>
-        </div>
-      </div>
+      <% end %>
+      <%= render 'admin/application/meta_description/form', f: f, about: event %>
     </div>
     <div class="col-md-4">
       <%= osuny_panel t('metadata') do %>
diff --git a/app/views/admin/communication/websites/agenda/events/_list.html.erb b/app/views/admin/communication/websites/agenda/events/_list.html.erb
index a58354711c009ec69e5ed64ec7baa7d0b0573739..3c1f386baf40794349ec947ad6e0e4d4c0be32c7 100644
--- a/app/views/admin/communication/websites/agenda/events/_list.html.erb
+++ b/app/views/admin/communication/websites/agenda/events/_list.html.erb
@@ -12,7 +12,7 @@
       </thead>
       <tbody>
         <% events.each do |event| %>
-          <tr <% unless event.published? %>class="draft"<% end %>>
+          <tr class="<% 'draft' unless event.published? %>">
             <td class="ps-0">
               <%= link_to event,
                           admin_communication_website_agenda_event_path(website_id: event.website.id, id: event.id),