Fix close button
Fix pagination buttons