finish user edit functionality
merge admin, user edits