Continued changes to make the popups work.