Add Waterfall layout and many more things
Merge branch 'add-waterfall-layout'