Refactor title and link

:+1: