fix updated column, add layout toggle support
fix updated column, add layout toggle support