Fix pagination and some misaligned issues