Fix HTML validity errors & better manage name links