major changes to app structure, masonry