fix layout and upload