Add: settings column
minor
merging Sof31t
merging Sof31t