Change layouts to use HTML5 elements