More layout constraint fixes for yosemite PBR2