Small fixes in popup content controller