Play and scores view
Play and scores views updated
Merge fix
Merge fix
Play, scores view and tabs edit