Change buttons and fix pager