More work on ui pager