Fix inverted popup headers, working through bugs with multiple popups