some improvements on edits views
merge