Add link target attribute, improved UI