Improvement in modals and pagination