Refactored next / prev on single route