GUI and hydrants logic fixes