Some more fixes for small screens