rest of masonry, which fixes #5. Also improve new beer preview and save