Merged branches, updated datatables and layout fixes