merge layout fixes