Using flex layout
Merge conflicts