rework on the layout; use masonry correctly, css=> scss