Refactor API services into component
Refactor map into component