Improved the datatable view