more ux improvements
url and template fixes