Reworking to integrate html5 boilerplate