Final changes to make it HTML5 Compliant