Added independent checks for different types of devices and retina displays