Update main screen
Update My Match screen to reflect the new changes in UI.
Clean up