Improve deletion + fix river view