* Improve paginator speed
* Improve theme