Fix/display

Resolutions for various small tickets. Refer to individual commit messages for more details and ticket identifiers.

Trying to sprint through the lower hanging fruit in the backlog to pick up some momentum again.