Fix calculated attribute formula layout
Multiple columns layout (work in progress)
Multiple columns layout
Merging conflicts