Improve pager
Add Demo resource