added s3 support and new login form