Re-commit the HTML link changes and the improvement provided by @michaelficarra in #3.