diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
index b1abca0..27c2427 100644
--- a/app/controllers/movies_controller.rb
+++ b/app/controllers/movies_controller.rb
@@ -2,7 +2,14 @@ class MoviesController < ApplicationController
   before_action :require_admin, except: [:index, :show]
 
   def index
-    @movies = Movie.released
+    case params[:filter]
+    when "upcoming"
+      @movies = Movie.upcoming
+    when "recent"
+      @movies = Movie.recent
+    else
+      @movies = Movie.released
+    end
   end
   def show
     @movie = Movie.find(params[:id])
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a9b26f4..94a3727 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,9 +8,9 @@
     </button>
     <div class="collapse navbar-collapse" id="navbarNav">
       <ul class="navbar-nav mr-auto">
-        <li class="nav-item">
-          <%= link_to "All Movies", movies_path, class: "nav-link" %>
-        </li>
+        <li class="nav-item"><%= link_to "Released", movies_path, class: "nav-link" %></li>
+        <li class="nav-item"><%= link_to "Upcoming", filtered_movies_path(:upcoming), class: "nav-link" %></li>
+        <li class="nav-item"><%= link_to "Recent", filtered_movies_path(:recent), class: "nav-link" %></li>
       </ul>
       <ul class="navbar-nav">
         <% if current_user %>
diff --git a/config/routes.rb b/config/routes.rb
index fe2687a..0a16b57 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,4 +11,5 @@ Rails.application.routes.draw do
     end
 
   get "signup" => "users#new"
+  get "movies/filter/:filter" => "movies#index", as: :filtered_movies
 end