WatermarkForm improvements