Added api call, cleaned up various components