Further layout fixes.