add links and more columns