Follow up to PR #6467, just a few minor UI tweaks to align it to the intended design
Close #6144
Closes #4918