Added better layout handling for high-res tablets