Add links everywhere as suggested by review