change the order
add will_paginate