Convert to content layout - better column handling