Layout tweaks to Tim's draft