File upload for new layout
Use hostname from environment

Fixes #41