Fix navigation and pagination