Made W3C compliant

Minor cosmetic changes and testing new linking method