diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 7426b16..9a1e94f 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -47,18 +47,16 @@
         type="button"
         phx-click="toggle_cycle_view"
         class={[
-          "btn btn-sm",
-          if(@show_current_cycle, do: "btn-primary", else: "btn-outline")
+          "btn btn-sm btn-outline gap-2",
+          @cycle_status_filter && "btn-active"
         ]}
-        aria-label={
-          if(@show_current_cycle,
-            do: gettext("Show last completed cycle"),
-            else: gettext("Show current cycle")
-          )
-        }
+        aria-label={gettext("Show Last/Current Cycle Payment Status")}
+        title={gettext("Show Last/Current Cycle Payment Status")}
       >
         <.icon name="hero-arrow-path" class="size-4" />
-        {if(@show_current_cycle, do: gettext("Current Cycle"), else: gettext("Last Cycle"))}
+        <span class="hidden sm:inline">
+          {gettext("Show Last/Current Cycle Payment Status")}
+        </span>
       </button>
     </div>
     <.live_component
diff --git a/test/mv_web/member_live/index/membership_fee_status_test.exs b/test/mv_web/member_live/index/membership_fee_status_test.exs
index 3321c74..3613276 100644
--- a/test/mv_web/member_live/index/membership_fee_status_test.exs
+++ b/test/mv_web/member_live/index/membership_fee_status_test.exs
@@ -362,7 +362,7 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
       filtered = MembershipFeeStatus.filter_unpaid_members(members, false)
 
       # Both members have no cycles, so both should be filtered out
-      assert length(filtered) == 0
+      assert Enum.empty?(filtered)
     end
   end
 end