WIP #5: Add close popup button