Little improvments and major layout change

Many little improvments and major layout change (abandonment of masonry
layout for horizontal alignment)
Revert "Little improvments and major layout change"

This reverts commit bb2bff0301c59a3e2a4b147b8e45605e1a874a75.