[TASK] Adjust class names and add dynamic two cols