Fixed header and pagination issues