BISERVER-8738 - Included remaining UX team feedback