Add links and modify layout a bit