Cleanup: unified admin URLs
Unified names for named URL patterns
CLEANUPS:     random templates cleanups