updated initial layout, fixed masonry issue