More small layout adjustments