Converted more of the iPad views to use the popups, conversion is more of a pain than I expected.