Theming updates
Improved pagination