Sorted display order of table and tooltip; added in num links attribute