Refactor title and link