Simplify river annotation
Fix delete card and list action