Add matching functionality and styles