Refactor: split arrow_links to partail form