incorporated pagination, datepicker and clean up