More code cleanup for multiple columns, reduced length of toast so less annoying.