Merge away last of basic-layout.html.