updated associations and views
changing views to read names/location instead of ids