More layout constraint fixes for yosemite PBR2

Fixes #33