Layout changes to export