Nicer table and wiki links