Contact and Overlay Layouts

Mirrors most recent port_site commit.