[WIP] Improved the UI experience for the matching process.