reduced number of api calls. cleaned up views.