better layout for the html, and continuing tweaks to cleave as closely to the mockup as possible