Some staff behind edit button - not ready yet and not will be in this PR