merge with upstream
add some template snippets, and use them in a template
use the new template, add a placeholder /logout route