Simplify layout and remove masonry