Refs #3089, fixing two small bugs.
Refs #3089, bug fixes and tweaks to appearance.