BISERVER-8947 - More tweaks merged in from UX
Merge pull request #567 from rfellows/dev

BISERVER-8947 - More tweaks merged in from UX