Reworking the URLs authentication and some templates
Merged with changes