Edit,New user form Refactored