Committe Bug Fixes

Create and Edit now use same function.