Updated to some HTM5 elements