Modified nav and datatables