Modification for SPK-070 and Water OPI

CM OPI Button for SPK-070 and SPK-030 added; Tage prefixes and Tooltips for Water OPI adjusted;