Up/back navigation should now work properly.
Merge pull request #138 from nwalters512/up_back_navigation

Up/back navigation should now work properly