Layout improvements

Xcode 6 only