Changed template structure for bootstrap columns