Improve the way additional links load/remove