optimize address & message pop-window
Add new template