Merge branch 'style-updates' into dev
Merge branch 'dev' into style-updates
Associations hovers

First round of hovers all added in.