Fix pagination and tabs