Update position and behavior of builder layout selector.

Addresses #442.