Some tweaking to the popup and adding content