Updated Entity Viewer