Major rework of DCC layouts, including Patrons