Fix layout and preferences for export