Same layout as previous commit, but HTML and CSS seem valid now.