reshuffles the markup, minor tweaks to the header.