WEB-6073 Link layout