Working on masonry class
Major improvements on Masonry