Re: #1020 remove-link fix / label and layout tweak