7.x bug fixes

Fixes for the display issues, uncovered in QA for #754 Port Book SP.