Fixes to layout constraints for yosemite beta.