Updated match-view and a few other content-related lines of code