Changed layout elements to be column-independent