fixes #6519 - updating associations UI
Merge pull request #4400 from thomasmckay/6406-associations

fixes #6519 - updating associations UI