A few adjustments, for proper rendering of the columns, and added custom container builder