Fixes to improve help experience& correct HTML build errors