Added the style to the final match view and hot fix
Merge branch 'feature/final_match' into develop