Matching - Work in progress

Initial setup for Matching screen