Rename column to row in column widget
Fix class naming on column widget