Water page indicator changes

- Revert full names for num_overhead_tanks, num_diesel, num_handpumps
for display in list.
- Removed Hand pumps category