layout, upload, fixes 4