added bootstrap, associations, moved around views