Adding links and tags