Update for 4" displays and better UI