Work on entity detail popup