refactoring (remove duplicated code)
implement edit mode
delete files
add cancel button
Merge branch 'develop'