updated button and pager stuff