Restructured the HTML, prepared for the final CSS, added some HTML5 semantics, plus minor other changes