More refactoring, plotting works properly

Refs #10391