User Add, Edit, fixed bugs