Toolbar and datatable fix