Use new viewlet manager
This refs #5470
Merge viewlets :-)