BISERVER-8947 - More tweaks merged in from UX
Merge pull request #88 from rfellows/develop

BISERVER-8947 - More tweaks merged in from UX