Fixed a couple of GrumpBugs. One necessitated a minor layout change.

Copyright © 2018 GrumpLog