Updates for watermark and embed page. Close #133.