PAHMA-1083: numerous small UX changes