Add new layout
Fix merge conflicts