Updated pagination and comments