Restored masonry and fixed git-advanced