Adding the edit part for user but need a lot of changes/removing