Further tweaks for small screens