Formatting fixes and add pagination.