3.0.4: a bit more space-making for small screens