cmviewer design cleanup