Authorizarion added (not working correct), additional templates