changed layout
merged layouts