[TASK] Link element and few minor fixes