auth popup, enhanced templates structure.