Html Popup and mild tweaks