UP-3980: Updating tables to use datatables