Added popup, click event and icons