Commiting template files
Refactored auth code