Upgraded HTML to Java7 (may need to be double-checked