LPS-36485 Move dependent controls under their parents