Bug fixes and Masonry Layout