Redesign layout
Merging