Akshay/Pooja: Water and SanitationView enhancements