Changed some of the structure and started using html5 tags