Added spinner, separated out paginator