Rework 595-108, fix watermark text boxes, add back in minutes -> hours conversion