Added the floating watermark feature

Closes #1318