Update position and behavior of builder layout selector. Also add "Layout" label. Addresses #442.
Merge pull request #577 from patternleaf/442-layout-selector

Update position and behavior of builder layout selector.