Almost finished user edit