Try flex layout
Merge branch 'inital-migration'