Further layout fixes