More HTML5 compliant. Restructured how data is sent to templates to be uniform