updated UI and improved matching