Pagination and styles fixes