diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 06072db..3518a48 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -11,21 +11,48 @@
<% if @navbar_items %>
<% @navbar_items.each do |navbar_item| %>
- -
+ <% dropdown = (navbar_item[:active] || @nav_path.to_s == navbar_item[:path].to_s) && @sidebar_items.any? %>
+
- ">
<% if navbar_item[:method].present? && navbar_item[:method] != :get %>
- <%= button_to(navbar_item[:path], method: navbar_item[:method], class: "nav-link") do %>
+ <%= button_to(navbar_item[:path], method: navbar_item[:method], class: "nav-link#{" dropdown-toggle" if dropdown }") do %>
<% if navbar_item[:icon] %>
<% end %>
<%= navbar_item[:label] %>
<% end %>
<% else %>
- " <%= @nav_path.to_s == navbar_item[:path].to_s && "aria-current=\"page\"" %> href="<%= url_for(navbar_item[:path]) %>">
- <% if navbar_item[:icon] %>
-
+
+
<% end %>
<% end %>
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
index 33c99c6..1525ece 100644
--- a/app/views/layouts/_sidebar.html.erb
+++ b/app/views/layouts/_sidebar.html.erb
@@ -1,4 +1,4 @@
-