Updated pagination and navigation