Tweaks proposed by Marius and orientation blocked in portrait fix for iPad