Entities page cleaned up