Refactor Connector
Refactor HomeViewController