diff --git a/rtv/submission.py b/rtv/submission.py
index 26405a5..5e8198c 100644
--- a/rtv/submission.py
+++ b/rtv/submission.py
@@ -5,7 +5,7 @@ import time
 import praw.errors
 
 from .content import SubmissionContent
-from .page import BasePage
+from .page import BasePage, Navigator
 from .helpers import clean, open_browser, open_editor
 from .curses_helpers import (BULLET, UARROW, DARROW, Color, LoadScreen,
                              show_help, show_notification, text_input)
@@ -95,8 +95,7 @@ class SubmissionPage(BasePage):
 
         url = self.content.name
         self.content = SubmissionContent.from_url(self.reddit, url, self.loader)
-        self.nav.page_index, self.nav.cursor_index = -1, 0
-        self.nav.inverted = False
+        self.nav = Navigator(self.content.get, page_index=-1)
 
     def open_link(self):
 
diff --git a/rtv/subreddit.py b/rtv/subreddit.py
index 501183f..8e6b47a 100644
--- a/rtv/subreddit.py
+++ b/rtv/subreddit.py
@@ -4,7 +4,7 @@ import sys
 import requests
 
 from .exceptions import SubredditError
-from .page import BasePage
+from .page import BasePage, Navigator
 from .submission import SubmissionPage
 from .content import SubredditContent
 from .helpers import clean, open_browser
@@ -81,16 +81,12 @@ class SubredditPage(BasePage):
         try:
             self.content = SubredditContent.from_name(
                 self.reddit, name, self.loader)
-
         except SubredditError:
             show_notification(self.stdscr, ['Invalid subreddit'])
-
         except requests.HTTPError:
             show_notification(self.stdscr, ['Could not reach subreddit'])
-
         else:
-            self.nav.page_index, self.nav.cursor_index = 0, 0
-            self.nav.inverted = False
+            self.nav = Navigator(self.content.get)
 
     def prompt_subreddit(self):
         "Open a prompt to type in a new subreddit"