Merge in changes from issue #3164724, which adds a bunch of CSS changes to improve the display of a bunch of UI elements.