Layout updates
merged with remote master