Fix layout issues on iOS 8 (tested on iPad) when rotated

ref #95 with one extra commit