Remove html dependency of .columns to be inside a .row
fixed conflicts