Add UI for match engine

Add UI for the match engine
Fix a few bugs in the match engine