Small tidy of base player deck - still global
Added overall room view