Merge common elements in .layout
Clean files
Fixing typo
Fixing typo