Adjust formatting and spacing to be consistent with wf-uicompontents standards