Refs #10046. Minor UI and javadoc changes.