Water Quality Code and UI

Small changes and bug fixes to ensure stability