Add links and fix design