added password change and logout back to base template