Status: Fix double render issue and update water level on refresh