style improvement. add paginator