add links and fix grid