7.x fix mobile and tablets