Update for mobile and big screens