Fix & clean  up for datatables
Fix user nav