Final touches to masonry directive for now