User add and edit now works in custom controller
Merging changes