BISERVER-8738 - Included remaining UX team feedback
Merge pull request #504 from webdetails/BISERVER-8738

BISERVER-8738 - Included remaining UX team feedback