Node linking and UI cleaning