Redraw Link re-factored to remove and add appropriately