Changed some UI in datatables, and fixed another issue