Better layout handling
Remove contents element from inside columns