Some more optimization for small screens