Work and Contact Layout

Mirrors recent port_size commit.