Moved nested classes in viewer widgets up
refs #546 #549