Fixed match view, ready to merge into master