Added toggle states, renamed view to matchviewer