Updated to include logged in as 'name' and logging out link to most templates