Simplify the HTML a bunch; Add a touch of documentation