Few fixes. Players views extracted to a separate file.