Added Edit and delete functions to manager.
Merge branch 'Expanding-Manager'