Fix Pager
Fix js app