Added regular layout
Solved merge conflict