Layout changes
Data can now be uploaded and downloaded correctly.