changed some of the buttons back to click and removed the click for close of the popup