Added Popup and Graphics