Moved water consumption form and meter out of hero unit