Changes Popup#show to take the presenter too

Further simplifies the circular relationship between the popup and its presenter