Updates to matching and buttons
Styling updates