Specs: update the layout and paint schemes to match discussions better

Review URL: https://codereview.chromium.org/745863002