Removed completed todo
Namespace updates
Fixed product link on basket view