fix delete issue and view issue
merge konflikt