Added WaterMap and improved dialog