add reset action status when click edit, formatting
Merge branch 'master' into users-and-colours

* master:
  add reset action status when click edit, formatting