new template, popups now working