Fixed typos in comments and added condition block so remove link will not display id address id does not exist because it hadn't been added to db.