Castello on Bruntsfield Links is now Margot. Looks like a good selection of cakes and bites to go with the coffee.