Finalize pagination and add minor stylistic changes