Issue 3323: Standardized editor buttons - some clean-up leading to reverting to the columns
Issue 3323: reverting to columns