Refactor and add "or" between links