Refactor + prospects detail  + list