Tidied up link editor