Build fixes and layout improvements for Mac on Yosemite.