Small style fixes in forms
Separate s3 logic into separate module and clean up auth.