Better login, template modification...