File upload

Changed overall layout, file uploading now works correctly.