updating some templates
merging auth and login stuff