Fixed layout devices issues