diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 65d5995..ee6bdc9 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -3,7 +3,11 @@ class MembersController < ApplicationController
 
   # GET /members
   def index
-    @members = Member.public_scope.order(:name).page params[:page]
+    @members = Member.public_scope.
+                where("arriving < ? " , Date.today).
+                where("leaving > ?" , Date.today).
+                order(:leaving).
+                page params[:page]
   end
 
   def timeline
diff --git a/app/views/members/index.html.haml b/app/views/members/index.html.haml
index feaea23..18535db 100644
--- a/app/views/members/index.html.haml
+++ b/app/views/members/index.html.haml
@@ -1,5 +1,9 @@
 = paginate @members
 
+.flex.justify-center.m-8.mx-5.md:mx-12.lg:mx-20
+  .flex.flex-col.text-center
+    %h1.text-4xl Current Volunteers at Hub Feenix
+
 .mx-20.grid.grid-cols-1.md:grid-cols-2.lg:grid-cols-3.2xl:grid-cols-4.gap-8.md:gap-12.lg:gap-16
   - @members.each do |member|
     .overflow-hidden.border.border-gray-100.shadow-sm