MDL-8096 - user edit form splitting, refactoring, cleanup and fixing - work in progre...