updated models, views and template to show water conditions