Several fixes on UI infopanel code