Adding links where appropriate