Updated Navigation - Fixed Previous and Next Rearranging