Changed template again and added login