More small layout fixes